Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba38bfc authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Don't require dev->struct_mutex in psr_match_conditions 



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@gmail.com>
Reported-by: default avatarPaulo Zanoni <przanoni@gmail.com>
Acked-by: default avatarPaulo Zanoni <przanoni@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 864c6181

drivers/gpu/drm/i915/intel_dp.c

+0 −1
Original line number Diff line number Diff line
@@ -1806,7 +1806,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));