[src/netbsd-7]: src/sys/external/bsd/drm2 Pull up following revision(s) (requ...

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

details:   https://anonhg.NetBSD.org/src/rev/7a01a0eeff18
branches:  netbsd-7
changeset: 798281:7a01a0eeff18
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Aug 22 10:32:18 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #45):
        sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.8
        sys/external/bsd/drm2/i915drm/files.i915drmkms: revision 1.6
Restore Intel opregion stuff.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h |  3 +--
 sys/external/bsd/drm2/i915drm/files.i915drmkms |  5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 34d94edbef93 -r 7a01a0eeff18 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Fri Aug 22 10:15:22 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Fri Aug 22 10:32:18 2014 +0000
@@ -2720,8 +2720,8 @@
 
 /* intel_opregion.c */
 struct intel_encoder;
+extern int intel_opregion_setup(struct drm_device *dev);
 #ifdef CONFIG_ACPI
-extern int intel_opregion_setup(struct drm_device *dev);
 extern void intel_opregion_init(struct drm_device *dev);
 extern void intel_opregion_fini(struct drm_device *dev);
 extern void intel_opregion_asle_intr(struct drm_device *dev);
@@ -2730,7 +2730,6 @@
 extern int intel_opregion_notify_adapter(struct drm_device *dev,
                                         pci_power_t state);
 #else
-static inline int intel_opregion_setup(struct drm_device *dev) { return 0; }
 static inline void intel_opregion_init(struct drm_device *dev) { return; }
 static inline void intel_opregion_fini(struct drm_device *dev) { return; }
 static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }
diff -r 34d94edbef93 -r 7a01a0eeff18 sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Fri Aug 22 10:15:22 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Fri Aug 22 10:32:18 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.5 2014/07/26 18:13:44 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.5.2.1 2014/08/22 10:32:19 martin Exp $
 
 define intelfbbus      { }
 device i915drmkms: drmkms, drmkms_pci, intelfbbus
@@ -60,8 +60,7 @@
 file   external/bsd/drm2/dist/drm/i915/intel_i2c.c     i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_lvds.c    i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_modes.c   i915drmkms
-# XXX Restore once I figure out what this does...
-#file  external/bsd/drm2/dist/drm/i915/intel_opregion.c        i915drmkms
+file   external/bsd/drm2/dist/drm/i915/intel_opregion.c        i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_overlay.c i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_panel.c   i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_pm.c      i915drmkms