[Intel-gfx] [PATCH] drm/i915: Don't require dev->struct_mutex in psr_match_conditions

[Paulo Zanoni]

2014-08-04 5:46 GMT-03:00 Daniel Vetter <daniel.vetter at ffwll.ch>:
> Since I've reworked psr support to no longer require x-tiling we don't
> check any state protected by the Giant GEM Lock. So drop that check.
>
> Also boo for lockdep_assert_held for not yelling when lockdep is
> disabled.
>
> Cc: Paulo Zanoni <przanoni at gmail.com>
> Reported-by: Paulo Zanoni <przanoni at gmail.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

I was going to start reviewing it, but then I realized it's already merged.

Do we have any doc explaining all our locks/mutexes and what each one
is supposed to protect?

Anyway, the patch looks fine.


> ---
>  drivers/gpu/drm/i915/intel_dp.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 3e6100ea7295..6dbe0f84d455 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1773,7 +1773,6 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp)
>         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>
>         lockdep_assert_held(&dev_priv->psr.lock);
> -       lockdep_assert_held(&dev->struct_mutex);
>         WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
>         WARN_ON(!drm_modeset_is_locked(&crtc->mutex));
>
> --
> 2.0.1
>



-- 
Paulo Zanoni