summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/i915
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2019-10-04 06:33:31 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2019-10-04 06:33:31 +0000
commit732e56a15ceb8054b665ee9d558d9cb4be23f1a4 (patch)
tree6f61605d0f3a96c3aa944e5a5170064e16673021 /sys/dev/pci/drm/i915
parent8db5a48d495a8d9504c01fe28f4139d710d3ef27 (diff)
Re-enable call to intel_hpd_poll_init() in vlv_display_power_well_deinit().
Allows valleyview and cherryview machines to boot without a display connected. Previously they would get flooded by HPD events. HPD is known to not work on valleyview and cherryview when powerwells are shut off. Reported by jan@ on tech@ with valleyview and km at krot.org on bugs@ with cherryview.
Diffstat (limited to 'sys/dev/pci/drm/i915')
-rw-r--r--sys/dev/pci/drm/i915/intel_runtime_pm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/intel_runtime_pm.c b/sys/dev/pci/drm/i915/intel_runtime_pm.c
index 5802e8f3872..149ddaddf33 100644
--- a/sys/dev/pci/drm/i915/intel_runtime_pm.c
+++ b/sys/dev/pci/drm/i915/intel_runtime_pm.c
@@ -1037,11 +1037,13 @@ static void vlv_display_power_well_deinit(struct drm_i915_private *dev_priv)
intel_power_sequencer_reset(dev_priv);
-#ifdef notyet
/* Prevent us from re-enabling polling on accident in late suspend */
+#ifdef __linux__
if (!dev_priv->drm.dev->power.is_suspended)
- intel_hpd_poll_init(dev_priv);
+#else
+ if (!cold)
#endif
+ intel_hpd_poll_init(dev_priv);
}
static void vlv_display_power_well_enable(struct drm_i915_private *dev_priv,