Re: [PATCH 37/39] drm: renesas: shmobile: Remove internal CRTC state tracking

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Thu, Jun 22, 2023 at 11:21:49AM +0200, Geert Uytterhoeven wrote:
> Now the suspend/resume methods no longer need to look at internal driver
> state, the dpms and started fields in the shmob_drm_crtc structure can
> be removed, as well as the shmob_drm_crtc_dpms() wrapper.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> ---
>  .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 35 ++++---------------
>  .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h |  3 --
>  2 files changed, 6 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
> index b11bb666de3bac46..f2332bb0fbbd51a1 100644
> --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
> +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
> @@ -196,9 +196,6 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
>  	u32 value;
>  	int ret;
>  
> -	if (scrtc->started)
> -		return;
> -
>  	ret = pm_runtime_resume_and_get(dev);
>  	if (ret)
>  		return;
> @@ -252,8 +249,6 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
>  
>  	/* Turn vertical blank interrupt reporting back on. */
>  	drm_crtc_vblank_on(crtc);
> -
> -	scrtc->started = true;
>  }
>  
>  /* -----------------------------------------------------------------------------
> @@ -314,9 +309,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
>  	struct drm_crtc *crtc = &scrtc->base;
>  	struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
>  
> -	if (!scrtc->started)
> -		return;
> -
>  	/*
>  	 * Disable vertical blank interrupt reporting.  We first need to wait
>  	 * for page flip completion before stopping the CRTC as userspace
> @@ -335,8 +327,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
>  	shmob_drm_clk_off(sdev);
>  
>  	pm_runtime_put(sdev->dev);
> -
> -	scrtc->started = false;
>  }
>  
>  static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc)
> @@ -344,21 +334,6 @@ static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc)
>  	return container_of(crtc, struct shmob_drm_crtc, base);
>  }
>  
> -static void shmob_drm_crtc_dpms(struct drm_crtc *crtc, int mode)
> -{
> -	struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
> -
> -	if (scrtc->dpms == mode)
> -		return;
> -
> -	if (mode == DRM_MODE_DPMS_ON)
> -		shmob_drm_crtc_start(scrtc);
> -	else
> -		shmob_drm_crtc_stop(scrtc);
> -
> -	scrtc->dpms = mode;
> -}
> -
>  static void shmob_drm_crtc_atomic_flush(struct drm_crtc *crtc,
>  					struct drm_atomic_state *state)
>  {
> @@ -378,13 +353,17 @@ static void shmob_drm_crtc_atomic_flush(struct drm_crtc *crtc,
>  static void shmob_drm_crtc_atomic_enable(struct drm_crtc *crtc,
>  					 struct drm_atomic_state *state)
>  {
> -	shmob_drm_crtc_dpms(crtc, DRM_MODE_DPMS_ON);
> +	struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
> +
> +	shmob_drm_crtc_start(scrtc);

If this function isn't called from any other location anymore, you may
want to inline it.

>  }
>  
>  static void shmob_drm_crtc_atomic_disable(struct drm_crtc *crtc,
>  					  struct drm_atomic_state *state)
>  {
> -	shmob_drm_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
> +	struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
> +
> +	shmob_drm_crtc_stop(scrtc);

Same here.

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>

>  }
>  
>  static const struct drm_crtc_helper_funcs crtc_helper_funcs = {
> @@ -476,8 +455,6 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)
>  
>  	init_waitqueue_head(&sdev->crtc.flip_wait);
>  
> -	sdev->crtc.dpms = DRM_MODE_DPMS_OFF;
> -
>  	primary = shmob_drm_plane_create(sdev, 0);
>  	if (IS_ERR(primary))
>  		return PTR_ERR(primary);
> diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h
> index 37380c815f1f5a08..89a0746f9a35807d 100644
> --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h
> +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h
> @@ -27,9 +27,6 @@ struct shmob_drm_crtc {
>  
>  	struct drm_pending_vblank_event *event;
>  	wait_queue_head_t flip_wait;
> -	int dpms;
> -
> -	bool started;
>  };
>  
>  struct shmob_drm_connector {

-- 
Regards,

Laurent Pinchart