aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2014-04-01 13:55:12 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-01 16:53:45 -0400
commit882244a3404088113f1add19d2d029f83e69efeb (patch)
tree38480b16726cb93e6401df48883b54e526e4dc3b
parenta23dc6584f2961b0888e24270a29d67a2f22a75b (diff)
drm/i915: fix WARNs when reading DDI state while suspended
If runtime PM is enabled and we unset all modes, we will runtime suspend after __intel_set_mode() , then function intel_modeset_check_state() will try to read the HW state while it is suspended and trigger lots of WARNs because it shouldn't be reading registers. So on this patch we make intel_ddi_connector_get_hw_state() return false in case the power domain is disabled, and we also make intel_display_power_enabled() return false in case the device is suspended. Notice that we can't just use intel_display_power_enabled_sw() because while the driver is being initialized the power domain refcounts are not reflecting the real state of the hardware. Just for reference, I have previously published an alternate patch for this problem, called "drm/i915: get runtime PM at intel_set_mode". Testcase: igt/pm_pc8 Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c5
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 070bf2e78d61..0ad4e9600063 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1108,8 +1108,13 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
1108 enum port port = intel_ddi_get_encoder_port(intel_encoder); 1108 enum port port = intel_ddi_get_encoder_port(intel_encoder);
1109 enum pipe pipe = 0; 1109 enum pipe pipe = 0;
1110 enum transcoder cpu_transcoder; 1110 enum transcoder cpu_transcoder;
1111 enum intel_display_power_domain power_domain;
1111 uint32_t tmp; 1112 uint32_t tmp;
1112 1113
1114 power_domain = intel_display_port_power_domain(intel_encoder);
1115 if (!intel_display_power_enabled(dev_priv, power_domain))
1116 return false;
1117
1113 if (!intel_encoder->get_hw_state(intel_encoder, &pipe)) 1118 if (!intel_encoder->get_hw_state(intel_encoder, &pipe))
1114 return false; 1119 return false;
1115 1120
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 453bf0cc21c0..9277265dc9a6 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5280,6 +5280,9 @@ bool intel_display_power_enabled(struct drm_i915_private *dev_priv,
5280 bool is_enabled; 5280 bool is_enabled;
5281 int i; 5281 int i;
5282 5282
5283 if (dev_priv->pm.suspended)
5284 return false;
5285
5283 power_domains = &dev_priv->power_domains; 5286 power_domains = &dev_priv->power_domains;
5284 5287
5285 is_enabled = true; 5288 is_enabled = true;