Wed Jul 24 03:21:07 2013 UTC ()
Omit more stuff that pmf does for us in i915_drv.c.


(riastradh)
diff -r1.1.1.1.2.8 -r1.1.1.1.2.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c

cvs diff -r1.1.1.1.2.8 -r1.1.1.1.2.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c (expand / switch to context diff)
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c 2013/07/24 03:20:52 1.1.1.1.2.8
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c 2013/07/24 03:21:07 1.1.1.1.2.9
@@ -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;
 }