[Intel-gfx] [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting

[Chris Wilson]

On Sun, 13 May 2012 22:08:14 +0200, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> ... we need it later on in the function to clean up pipe <-> plane
> associations. This regression has been introduced in
> 
> commit f47166d2b0001fcb752b40c5a2d4db986dfbea68
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date:   Thu Mar 22 15:00:50 2012 +0000
> 
>     drm/i915: Sanitize BIOS debugging bits from PIPECONF
> 
> Spotted by staring at debug output of an (as it turns out) totally
> unrelated bug.
> 
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: stable at kernel.org (the regression was Cc: stable, too)
> Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Note this will also explain some of the bogosity with
https://bugs.freedesktop.org/show_bug.cgi?id=49838 on dinq.

> ---
>  drivers/gpu/drm/i915/intel_display.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index fb05d9d..525dc65 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6257,9 +6257,10 @@ static void intel_sanitize_modesetting(struct drm_device *dev,
>  {
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	u32 reg, val;
> +	int i;
>  
>  	/* Clear any frame start delays used for debugging left by the BIOS */
> -	for_each_pipe(pipe) {
> +	for_each_pipe(i) {
>  		reg = PIPECONF(pipe);
s/pipe/i/
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre