[Intel-gfx] [PATCH 2/8] drm/i915: add the FBC mutex

[Chris Wilson]

On Tue, Jun 30, 2015 at 10:53:06AM -0300, Paulo Zanoni wrote:
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index eb665d7..eab5aa1 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4741,7 +4741,6 @@ static void intel_post_plane_update(struct intel_crtc *crtc)
>  static void intel_pre_plane_update(struct intel_crtc *crtc)
>  {
>  	struct drm_device *dev = crtc->base.dev;
> -	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct intel_crtc_atomic_commit *atomic = &crtc->atomic;
>  	struct drm_plane *p;
>  
> @@ -4758,13 +4757,8 @@ static void intel_pre_plane_update(struct intel_crtc *crtc)
>  	if (atomic->wait_for_flips)
>  		intel_crtc_wait_for_pending_flips(&crtc->base);
>  
> -	if (atomic->disable_fbc &&
> -	    dev_priv->fbc.crtc == crtc) {
> -		mutex_lock(&dev->struct_mutex);
> -		if (dev_priv->fbc.crtc == crtc)
> -			intel_fbc_disable(dev);
> -		mutex_unlock(&dev->struct_mutex);
> -	}
> +	if (atomic->disable_fbc)
> +		intel_fbc_disable_crtc(crtc);

Wrong patch? (This patch is called add fbc_mutex without touching
struct_mutex)
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre