[Intel-gfx] [PATCH v2 19/21] Reapply "drm/i915: Avoid stalling on pending flips for legacy cursor updates"

[Patrik Jakobsson]

On Tue, May 17, 2016 at 03:08:02PM +0200, Maarten Lankhorst wrote:
> This reapplies commit acf4e84d6167317ff21be5c03e1ea76ea5783701.
> With async unpin this should no longer break.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Reviewed-by: Patrik Jakobsson <patrik.jakobsson at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_display.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 16d8e299994d..9236407e9b13 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12930,12 +12930,14 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,
>  		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>  		struct intel_flip_work *work;
>  
> -		ret = intel_crtc_wait_for_pending_flips(crtc);
> -		if (ret)
> -			return ret;
> +		if (!state->legacy_cursor_update) {
> +			ret = intel_crtc_wait_for_pending_flips(crtc);
> +			if (ret)
> +				return ret;
>  
> -		if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
> -			flush_workqueue(dev_priv->wq);
> +			if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
> +				flush_workqueue(dev_priv->wq);
> +		}
>  
>  		/* test if we need to update something */
>  		if (!needs_work(crtc_state))
> -- 
> 2.5.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Intel Sweden AB Registered Office: Knarrarnasgatan 15, 164 40 Kista, Stockholm, Sweden Registration Number: 556189-6027