summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorPaulo Zanoni2013-12-20 18:09:41 +0100
committerDaniel Vetter2014-01-07 15:30:27 +0100
commit38cc1daf0c9d22b05b00fcb72744003d7b63fece (patch)
tree7c86ead68a27e4455390dc5c1818244c96f8cb32 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Flush outstanding requests before allocating new seqno (diff)
downloadkernel-qcow2-linux-38cc1daf0c9d22b05b00fcb72744003d7b63fece.tar.gz
kernel-qcow2-linux-38cc1daf0c9d22b05b00fcb72744003d7b63fece.tar.xz
kernel-qcow2-linux-38cc1daf0c9d22b05b00fcb72744003d7b63fece.zip
drm/i915: avoid unclaimed registers when capturing the error state
We're iterating over the CPU transcoders, so check for the correct power domain. This fixes many "unclaimed register" error messages. This can be reproduced by the IGT test mentioned below, but we still get a FAIL when we run it. Testcase: igt/kms_lip/flip-vs-panning-vs-hang Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index de5bbd791be5..b6c76a911624 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11457,7 +11457,8 @@ intel_display_capture_error_state(struct drm_device *dev)
enum transcoder cpu_transcoder = transcoders[i];
error->transcoder[i].power_domain_on =
- intel_display_power_enabled_sw(dev, POWER_DOMAIN_PIPE(i));
+ intel_display_power_enabled_sw(dev,
+ POWER_DOMAIN_TRANSCODER(cpu_transcoder));
if (!error->transcoder[i].power_domain_on)
continue;