[Intel-gfx] [PATCH 09/16] drm/i915: More checks for psr.enabled

[Chris Wilson]

On Wed, Jun 18, 2014 at 01:59:10PM +0200, Daniel Vetter wrote:
> We need to make sure that no one else is using this in the
> enable function and also that the work item hasn't raced
> with the disabled function.
> 
> v2: Improve bisectability by moving one hunk to an earlier patch.
> 
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 910f73de3a92..870219ff1187 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1844,6 +1844,11 @@ void intel_edp_psr_enable(struct intel_dp *intel_dp)
>  		return;
>  	}

Is this the tail of a HAS_PSR() now made obsolete?
  
> +	if (dev_priv->psr.enabled) {
> +		DRM_DEBUG_KMS("PSR already in use\n");
> +		return;
> +	}
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre