[Intel-gfx] [PATCH] drm/i915: overlay: kill one more unnecessary uninterruptible sleep

[Eric Anholt]

On Sun, 2009-10-04 at 15:00 +0200, Daniel Vetter wrote:
> I've simply overlooked one case in the conversion to interruptible
> sleeps. Rectify this.
> 
> Also delete a leftover debug printk.

OK, I'm confused about what this patch is about.  I thought you were
going to check if the patch series I applied was the right one or not,
given that it was older than your comment "please pull my tree instead
of the patch series I sent out" on IRC.

> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_overlay.c |   17 +++++++----------
>  1 files changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index 972d715..f1bf0b0 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -286,16 +286,15 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay)
>  	RING_LOCALS;
>  
>  	if (overlay->last_flip_req != 0) {
> -		ret = i915_do_wait_request(dev, overlay->last_flip_req, 0);
> -		if (ret != 0)
> -			return ret;
> -
> -		overlay->last_flip_req = 0;
> +		ret = i915_do_wait_request(dev, overlay->last_flip_req, 1);
> +		if (ret == 0) {
> +			overlay->last_flip_req = 0;
>  
> -		tmp = I915_READ(ISR);
> +			tmp = I915_READ(ISR);
>  
> -		if (!(tmp & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
> -			return 0;
> +			if (!(tmp & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
> +				return 0;
> +		}
>  	}
>  
>  	/* synchronous slowpath */
> @@ -439,8 +438,6 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
>  				return ret;
>  
>  		case SWITCH_OFF_STAGE_2:
> -			printk("switch off 2\n");
> -
>  			BUG_ON(!overlay->vid_bo);
>  			obj = overlay->vid_bo->obj;
>  


-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


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