diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-04 04:45:00 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-07 05:07:18 -0400 |
commit | cba38bfc448b5ea569077e652938cc4385ab38fe (patch) | |
tree | 14625d2edfad9960f9c1bb6b40454964aaee9192 | |
parent | 864c61811c7c3d877e8fb3162eeb8616f2c8e9b8 (diff) |
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: Paulo Zanoni <przanoni@gmail.com>
Acked-by: Paulo Zanoni <przanoni@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 874143981072..805b6f63df0f 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -1806,7 +1806,6 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp) | |||
1806 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); | 1806 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); |
1807 | 1807 | ||
1808 | lockdep_assert_held(&dev_priv->psr.lock); | 1808 | lockdep_assert_held(&dev_priv->psr.lock); |
1809 | lockdep_assert_held(&dev->struct_mutex); | ||
1810 | WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); | 1809 | WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); |
1811 | WARN_ON(!drm_modeset_is_locked(&crtc->mutex)); | 1810 | WARN_ON(!drm_modeset_is_locked(&crtc->mutex)); |
1812 | 1811 | ||