[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Omit more stuff...

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

details:   https://anonhg.NetBSD.org/src/rev/2d53aabc0118
branches:  riastradh-drm2
changeset: 788344:2d53aabc0118
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:21:07 2013 +0000

description:
Omit more stuff that pmf does for us in i915_drv.c.

diffstat:

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

diffs (39 lines):

diff -r c00565913616 -r 2d53aabc0118 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Wed Jul 24 03:20:52 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Wed Jul 24 03:21:07 2013 +0000
@@ -538,11 +538,13 @@
        if (error)
                return error;
 
+#ifndef __NetBSD__             /* pmf handles this for us.  */
        if (state.event == PM_EVENT_SUSPEND) {
                /* Shut down the device */
                pci_disable_device(dev->pdev);
                pci_set_power_state(dev->pdev, PCI_D3hot);
        }
+#endif
 
        return 0;
 }
@@ -630,8 +632,10 @@
        if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
                return 0;
 
+#ifndef __NetBSD__             /* pmf handles this for us.  */
        if (pci_enable_device(dev->pdev))
                return -EIO;
+#endif
 
        pci_set_master(dev->pdev);
 
@@ -956,8 +960,10 @@
        if (error)
                return error;
 
+#ifndef __NetBSD__             /* pmf handles this for us.  */
        pci_disable_device(pdev);
        pci_set_power_state(pdev, PCI_D3hot);
+#endif
 
        return 0;
 }