drm: renesas: shmobile: Remove internal CRTC state tracking

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.  After this,
shmob_drm_crtc_atomic_{en,dis}able() became just wrappers around
shmob_drm_crtc_st{art,op}(), so inline the latter.

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/905b9ca72f43d40438c8cb1199cde140eb123204.1694767209.git.geert+renesas@glider.be

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
index a176cd3e494ed2fd81cc084f614ab50d0e7e31ec..e4d176b1f47654a8fbd21333a9178b2ae92c292b 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
@@ -191,25 +191,21 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)
        }
 }
 
-/*
- * shmob_drm_crtc_start - Configure and start the LCDC
- * @scrtc: the SH Mobile CRTC
- *
- * Configure and start the LCDC device. External devices (clocks, MERAM, panels,
- * ...) are not touched by this function.
- */
-static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
+static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc)
 {
-       struct drm_crtc *crtc = &scrtc->base;
+       return container_of(crtc, struct shmob_drm_crtc, base);
+}
+
+static void shmob_drm_crtc_atomic_enable(struct drm_crtc *crtc,
+                                        struct drm_atomic_state *state)
+{
+       struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
        struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
        const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;
        struct device *dev = sdev->dev;
        u32 value;
        int ret;
 
-       if (scrtc->started)
-               return;
-
        ret = pm_runtime_resume_and_get(dev);
        if (ret)
                return;
@@ -256,18 +252,14 @@ 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;
 }
 
-static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
+static void shmob_drm_crtc_atomic_disable(struct drm_crtc *crtc,
+                                         struct drm_atomic_state *state)
 {
-       struct drm_crtc *crtc = &scrtc->base;
+       struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
        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
@@ -283,28 +275,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
        lcdc_write(sdev, LDCNT1R, 0);
 
        pm_runtime_put(sdev->dev);
-
-       scrtc->started = false;
-}
-
-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,
@@ -323,18 +293,6 @@ 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);
-}
-
-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);
-}
-
 static const struct drm_crtc_helper_funcs crtc_helper_funcs = {
        .atomic_flush = shmob_drm_crtc_atomic_flush,
        .atomic_enable = shmob_drm_crtc_atomic_enable,
@@ -424,8 +382,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, DRM_PLANE_TYPE_PRIMARY, 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 37380c815f1f5a084f309a3c12ac31637b62e49c..89a0746f9a35807df647ac45ec08f036089b764e 100644 (file)
--- 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 {