drm/msm: rework vblank event handling in dpu_crtc
PATCH 1/1 drm/msm: rework vblank event handling in dpu_crtc
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
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +14 -1
@@ -1617,6 +1617,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" );
@@ -1632,6 +1633,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 */
@@ -1669,7 +1673,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;
@@ -1679,6 +1682,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,
@@ -1718,6 +1728,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 |
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 1531486643-26214-1-git-send-email-ryadav-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Sean Paul
AppliedQuoted 9 lines · Rajesh Yadav
The vblank on/off calls were missing in
dpu_crtcleading to "driver forgot to calldrm_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 <[email protected]>
Applied to dpu-staging/for-next.
Thanks!
Sean
Quoted 62 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +14
-1@@ -1617,6 +1617,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" );@@ -1632,6 +1633,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 */ @@ -1669,7 +1673,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;@@ -1679,6 +1682,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,@@ -1718,6 +1728,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 |Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno