Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:04:22 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
Disable and enable some i915 pm code.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.9 Mon Aug 27 07:03:25 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Mon Aug 27 07:04:22 2018
@@ -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 @@ static int i915_drm_suspend_late(struct
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 @@ static int i915_drm_suspend_late(struct
*/
if (!(hibernation && INTEL_INFO(dev_priv)->gen < 6))
pci_set_power_state(drm_dev->pdev, PCI_D3hot);
+#endif
return 0;
}
@@ -1653,6 +1655,8 @@ static int intel_runtime_resume(struct d
return ret;
}
+#endif /* __NetBSD__ */
+
/*
* This function implements common functionality of runtime and system
* suspend sequence.
@@ -1675,6 +1679,8 @@ static int intel_suspend_complete(struct
return ret;
}
+#ifndef __NetBSD__
+
static const struct dev_pm_ops i915_pm_ops = {
/*
* S0ix (via system suspend) and S3 event handlers [PMSG_SUSPEND,
