[Intel-gfx] [PATCH] drm/i915: avoid unclaimed registers when capturing the error state

[Imre Deak]

On Fri, 2013-12-20 at 15:09 -0200, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni at intel.com>
> 
> 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 at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 
> I didn't bisect to check, but it really really looks like a regression from
> "drm/i915: add intel_display_power_enabled_sw() for use in atomic ctx".

Yep, that was an overlook on my part:/ The fix looks ok:
Reviewed-by: Imre Deak <imre.deak at intel.com>

> 
> 
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 4d1357a..4d4b4bc 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11459,7 +11459,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;
>  

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20140107/f1e4b74e/attachment.sig>