Skip to content

Commit

Permalink
drm/msm: rework vblank event handling in dpu_crtc
Browse files Browse the repository at this point in the history
The vblank on/off calls were missing in dpu_crtc
leading to "driver forgot to call drm_crtc_vblank_off()"
warning while entering suspend state.
Also handle the state update completion event for
a crtc being disabled in current atomic commit.

This patch depends on https://www.spinics.net/lists/dri-devel/msg182402.html

Signed-off-by: Rajesh Yadav <ryadav@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
  • Loading branch information
Rajesh Yadav authored and Sean Paul committed Jul 26, 2018
1 parent 25fdd59 commit 2f2eb72
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
struct drm_encoder *encoder;
struct msm_drm_private *priv;
int ret;
unsigned long flags;

if (!crtc || !crtc->dev || !crtc->dev->dev_private || !crtc->state) {
DPU_ERROR("invalid crtc\n");
Expand All @@ -1621,6 +1622,9 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
if (dpu_kms_is_suspend_state(crtc->dev))
_dpu_crtc_set_suspend(crtc, true);

/* Disable/save vblank irq handling */
drm_crtc_vblank_off(crtc);

mutex_lock(&dpu_crtc->crtc_lock);

/* wait for frame_event_done completion */
Expand Down Expand Up @@ -1658,7 +1662,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
dpu_power_handle_unregister_event(dpu_crtc->phandle,
dpu_crtc->power_event);


memset(dpu_crtc->mixers, 0, sizeof(dpu_crtc->mixers));
dpu_crtc->num_mixers = 0;
dpu_crtc->mixers_swapped = false;
Expand All @@ -1668,6 +1671,13 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
cstate->bw_split_vote = false;

mutex_unlock(&dpu_crtc->crtc_lock);

if (crtc->state->event && !crtc->state->active) {
spin_lock_irqsave(&crtc->dev->event_lock, flags);
drm_crtc_send_vblank_event(crtc, crtc->state->event);
crtc->state->event = NULL;
spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
}
}

static void dpu_crtc_enable(struct drm_crtc *crtc,
Expand Down Expand Up @@ -1707,6 +1717,9 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,

mutex_unlock(&dpu_crtc->crtc_lock);

/* Enable/restore vblank irq handling */
drm_crtc_vblank_on(crtc);

dpu_crtc->power_event = dpu_power_handle_register_event(
dpu_crtc->phandle,
DPU_POWER_EVENT_POST_ENABLE | DPU_POWER_EVENT_POST_DISABLE |
Expand Down

0 comments on commit 2f2eb72

Please sign in to comment.