From: Paulo Zanoni Date: Fri, 20 Dec 2013 17:09:41 +0000 (-0200) Subject: drm/i915: avoid unclaimed registers when capturing the error state X-Git-Tag: v3.14-rc1~47^2~16^2~26 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=38cc1daf0c9d22b05b00fcb72744003d7b63fece;p=uclinux-h8%2Flinux.git 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 Reviewed-by: Imre Deak Signed-off-by: Daniel Vetter --- 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;