[Intel-gfx] [PATCH] drm/i915: move debug output back to the right place

[Ville Syrjälä]

On Thu, Apr 11, 2013 at 04:39:53PM +0200, Daniel Vetter wrote:
> When adding the pipe config computation step I've accidentally moved
> this a bit away. Which momentarily confused me since the pipe config
> step rejected some modesetting operations I expected and so left me
> looking in vain for that debug output.
> 
> v2: Move the debug output into the right function to prevent this from
> happening again.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 1b2c744..95f92ba 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -7629,6 +7629,9 @@ intel_modeset_affected_pipes(struct drm_crtc *crtc, unsigned *modeset_pipes,
>  	/* ... and mask these out. */
>  	*modeset_pipes &= ~(*disable_pipes);
>  	*prepare_pipes &= ~(*disable_pipes);
> +
> +	DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n",
> +		      modeset_pipes, prepare_pipes, disable_pipes);

*modeset_pipes, *prepare_pipes, *disable_pipes);

>  }
>  
>  static bool intel_crtc_in_use(struct drm_crtc *crtc)
> @@ -7859,9 +7862,6 @@ int intel_set_mode(struct drm_crtc *crtc,
>  		}
>  	}
>  
> -	DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n",
> -		      modeset_pipes, prepare_pipes, disable_pipes);
> -
>  	for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc)
>  		intel_crtc_disable(&intel_crtc->base);
>  
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC