[Freedreno] [PATCH] drm/msm: rework vblank event handling in dpu_crtc

[Sean Paul]

On Fri, Jul 13, 2018 at 06:27:23PM +0530, Rajesh Yadav wrote:
> 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 at codeaurora.org>

Applied to dpu-staging/for-next.

Thanks!

Sean

> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index d171282..24715e4 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -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 |
> -- 
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
> 

-- 
Sean Paul, Software Engineer, Google / Chromium OS