Module Name: src
Committed By: skrll
Date: Sat Sep 10 06:46:09 UTC 2016
Modified Files:
src/sys/modules/drmkms_linux [netbsd-7-nhusb]: Makefile
src/sys/modules/i915drmkms [netbsd-7-nhusb]: Makefile
Log Message:
Sync with HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.2 -r1.4.2.2.4.1 src/sys/modules/drmkms_linux/Makefile
cvs rdiff -u -r1.4.2.1 -r1.4.2.1.4.1 src/sys/modules/i915drmkms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drmkms_linux/Makefile
diff -u src/sys/modules/drmkms_linux/Makefile:1.4.2.2 src/sys/modules/drmkms_linux/Makefile:1.4.2.2.4.1
--- src/sys/modules/drmkms_linux/Makefile:1.4.2.2 Fri Mar 6 21:39:11 2015
+++ src/sys/modules/drmkms_linux/Makefile Sat Sep 10 06:46:09 2016
@@ -1,8 +1,15 @@
-# $NetBSD: Makefile,v 1.4.2.2 2015/03/06 21:39:11 snj Exp $
+# $NetBSD: Makefile,v 1.4.2.2.4.1 2016/09/10 06:46:09 skrll Exp $
+
+#
+# At some point this needs to turn into linux.kmod and a proper home for it
+# found. For now pickup the linux_work.c from the (increasingly poorly
+# named) common area.
+#
.include "../Makefile.inc"
.PATH: ${S}/external/bsd/drm2/linux
+.PATH: ${S}/external/bsd/common/linux
CPPFLAGS+= -I${S}/external/bsd/common/include
CPPFLAGS+= -I${S}/external/bsd/drm2/include
Index: src/sys/modules/i915drmkms/Makefile
diff -u src/sys/modules/i915drmkms/Makefile:1.4.2.1 src/sys/modules/i915drmkms/Makefile:1.4.2.1.4.1
--- src/sys/modules/i915drmkms/Makefile:1.4.2.1 Sun Jan 11 05:59:18 2015
+++ src/sys/modules/i915drmkms/Makefile Sat Sep 10 06:46:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.2.1 2015/01/11 05:59:18 snj Exp $
+# $NetBSD: Makefile,v 1.4.2.1.4.1 2016/09/10 06:46:09 skrll Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -77,7 +77,8 @@ COPTS.intel_display.c+= -Wno-shadow -Wno
COPTS.intel_panel.c+= -Wno-shadow
COPTS.intel_pm.c+= -Wno-shadow
-CPPFLAGS+= -DCONFIG_DRM_I915_FBDEV
+CPPFLAGS+= -DCONFIG_DRM_I915_FBDEV=1
+CPPFLAGS+= -DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0
CPPFLAGS+= -DNACPICA=1
CPPFLAGS+= -DNVGA=1
