diff options
| author | Paulo Zanoni | 2014-04-01 19:55:12 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-04-01 22:53:45 +0200 |
| commit | 882244a3404088113f1add19d2d029f83e69efeb (patch) | |
| tree | 38480b16726cb93e6401df48883b54e526e4dc3b /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: don't read cursor registers on powered down pipes (diff) | |
| download | kernel-qcow2-linux-882244a3404088113f1add19d2d029f83e69efeb.tar.gz kernel-qcow2-linux-882244a3404088113f1add19d2d029f83e69efeb.tar.xz kernel-qcow2-linux-882244a3404088113f1add19d2d029f83e69efeb.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 3 |
1 files changed, 3 insertions, 0 deletions
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, bool is_enabled; int i; + if (dev_priv->pm.suspended) + return false; + power_domains = &dev_priv->power_domains; is_enabled = true; |