Commit b01c2399 authored by Sean Paul's avatar Sean Paul Committed by Rob Clark

drm/msm: dpu: Don't drop locks in crtc_vblank_enable

Now that runtime resume is handled in encoder, we don't need to worry
about crtc_lock recursion when calling pm_runtime_(get|put). So drop the
lock drops in _dpu_crtc_vblank_enable_no_lock().

Changes in v2:
- None
Reviewed-by: default avatarJeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 18a63b3c
...@@ -781,10 +781,7 @@ static void _dpu_crtc_vblank_enable_no_lock( ...@@ -781,10 +781,7 @@ static void _dpu_crtc_vblank_enable_no_lock(
struct drm_encoder *enc; struct drm_encoder *enc;
if (enable) { if (enable) {
/* drop lock since power crtc cb may try to re-acquire lock */
mutex_unlock(&dpu_crtc->crtc_lock);
pm_runtime_get_sync(dev->dev); pm_runtime_get_sync(dev->dev);
mutex_lock(&dpu_crtc->crtc_lock);
list_for_each_entry(enc, &dev->mode_config.encoder_list, head) { list_for_each_entry(enc, &dev->mode_config.encoder_list, head) {
if (enc->crtc != crtc) if (enc->crtc != crtc)
...@@ -809,10 +806,7 @@ static void _dpu_crtc_vblank_enable_no_lock( ...@@ -809,10 +806,7 @@ static void _dpu_crtc_vblank_enable_no_lock(
dpu_encoder_register_vblank_callback(enc, NULL, NULL); dpu_encoder_register_vblank_callback(enc, NULL, NULL);
} }
/* drop lock since power crtc cb may try to re-acquire lock */
mutex_unlock(&dpu_crtc->crtc_lock);
pm_runtime_put_sync(dev->dev); pm_runtime_put_sync(dev->dev);
mutex_lock(&dpu_crtc->crtc_lock);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment