[src/netbsd-7-nhusb]: src/sys/modules Sync with HEAD

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51fa1621a975
branches:  netbsd-7-nhusb
changeset: 801030:51fa1621a975
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Sep 10 06:46:09 2016 +0000

description:
Sync with HEAD

diffstat:

 sys/modules/drmkms_linux/Makefile |  9 ++++++++-
 sys/modules/i915drmkms/Makefile   |  5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r cb7c5111343c -r 51fa1621a975 sys/modules/drmkms_linux/Makefile
--- a/sys/modules/drmkms_linux/Makefile Fri Sep 09 12:14:46 2016 +0000
+++ b/sys/modules/drmkms_linux/Makefile Sat Sep 10 06:46:09 2016 +0000
@@ -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
diff -r cb7c5111343c -r 51fa1621a975 sys/modules/i915drmkms/Makefile
--- a/sys/modules/i915drmkms/Makefile   Fri Sep 09 12:14:46 2016 +0000
+++ b/sys/modules/i915drmkms/Makefile   Sat Sep 10 06:46:09 2016 +0000
@@ -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_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