[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Disable and enable some ...

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

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

description:
Disable and enable some i915 pm code.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r 8410936f9650 -r da93bb82b8fd 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:11 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Mon Aug 27 07:04:22 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.9 2018/08/27 07:03:25 riastradh Exp $   */
+/*     $NetBSD: i915_drv.c,v 1.10 2018/08/27 07:04:22 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.9 2018/08/27 07:03:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.10 2018/08/27 07:04:22 riastradh Exp $");
 
 #include <linux/device.h>
 #include <linux/acpi.h>
@@ -725,6 +725,7 @@
                return ret;
        }
 
+#ifndef __NetBSD__             /* pmf handles this for us.  */
        pci_disable_device(drm_dev->pdev);
        /*
         * During hibernation on some platforms the BIOS may try to access
@@ -740,6 +741,7 @@
         */
        if (!(hibernation && INTEL_INFO(dev_priv)->gen < 6))
                pci_set_power_state(drm_dev->pdev, PCI_D3hot);
+#endif
 
        return 0;
 }
@@ -1653,6 +1655,8 @@
        return ret;
 }
 
+#endif /* __NetBSD__ */
+
 /*
  * This function implements common functionality of runtime and system
  * suspend sequence.
@@ -1675,6 +1679,8 @@
        return ret;
 }
 
+#ifndef __NetBSD__
+
 static const struct dev_pm_ops i915_pm_ops = {
        /*
         * S0ix (via system suspend) and S3 event handlers [PMSG_SUSPEND,