[Intel-gfx] [PATCH 54/58] drm/i915: WARN if the pipe won't turn off

[Jesse Barnes]

On Sun, 19 Aug 2012 21:13:11 +0200
Daniel Vetter <daniel.vetter at ffwll.ch> wrote:

> This seems to be the symptom of a few neat bugs, hence be more
> obnoxious when this fails.
> 
> Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a716893..da45d39 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1006,7 +1006,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe)
>  		/* Wait for the Pipe State to go off */
>  		if (wait_for((I915_READ(reg) & I965_PIPECONF_ACTIVE) == 0,
>  			     100))
> -			DRM_DEBUG_KMS("pipe_off wait timed out\n");
> +			WARN(1, "pipe_off wait timed out\n");
>  	} else {
>  		u32 last_line, line_mask;
>  		int reg = PIPEDSL(pipe);
> @@ -1024,7 +1024,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe)
>  		} while (((I915_READ(reg) & line_mask) != last_line) &&
>  			 time_after(timeout, jiffies));
>  		if (time_after(jiffies, timeout))
> -			DRM_DEBUG_KMS("pipe_off wait timed out\n");
> +			WARN(1, "pipe_off wait timed out\n");
>  	}
>  }
>  

I hope we can actually fix all the issues this will report... :)

Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center