[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Tweak ifdefs in i915_drv.c.

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

details:   https://anonhg.NetBSD.org/src/rev/f47607eb602f
branches:  trunk
changeset: 992575:f47607eb602f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:04:44 2018 +0000

description:
Tweak ifdefs in i915_drv.c.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r eb2e828eaa46 -r f47607eb602f sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Mon Aug 27 07:04:32 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Mon Aug 27 07:04:44 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.10 2018/08/27 07:04:22 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.11 2018/08/27 07:04:44 riastradh Exp $  */
 
 /* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
  */
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.10 2018/08/27 07:04:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.11 2018/08/27 07:04:44 riastradh Exp $");
 
 #include <linux/device.h>
 #include <linux/acpi.h>
@@ -1032,6 +1032,7 @@
 
        drm_put_dev(dev);
 }
+#endif
 
 #ifndef __NetBSD__
 static int i915_pm_suspend(struct device *dev)
@@ -1514,6 +1515,7 @@
        return ret;
 }
 
+#ifndef __NetBSD__             /* XXX runtime pm */
 static int intel_runtime_suspend(struct device *device)
 {
        struct pci_dev *pdev = to_pci_dev(device);
@@ -1654,8 +1656,7 @@
 
        return ret;
 }
-
-#endif /* __NetBSD__ */
+#endif
 
 /*
  * This function implements common functionality of runtime and system