drm/i915: avoid unclaimed registers when capturing the error state
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 20 Dec 2013 17:09:41 +0000 (15:09 -0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 7 Jan 2014 14:30:27 +0000 (15:30 +0100)
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>
drivers/gpu/drm/i915/intel_display.c

index de5bbd791be5aead3ae362c80e7d5141b2d145f9..b6c76a911624cccdb3c8ea55e887c665dd375d46 100644 (file)
@@ -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;