MLK-17231-2: drm: imx: dcss: Do not use mode_set_nofb callback

This callback is not suitable for drivers using runtime PM. Move
everything in the crtc_enable() callback.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>

diff --git a/drivers/gpu/drm/imx/dcss/dcss-crtc.c b/drivers/gpu/drm/imx/dcss/dcss-crtc.c
index e75a584..86d3c4b 100644 (file)
--- a/drivers/gpu/drm/imx/dcss/dcss-crtc.c
+++ b/drivers/gpu/drm/imx/dcss/dcss-crtc.c
@@ -101,26 +101,6 @@ static const struct drm_crtc_funcs dcss_crtc_funcs = {
        .atomic_destroy_state = dcss_crtc_destroy_state,
 };
 
-static void dcss_crtc_mode_set_nofb(struct drm_crtc *crtc)
-{
-       struct dcss_crtc *dcss_crtc = container_of(crtc, struct dcss_crtc,
-                                                  base);
-       struct drm_display_mode *mode = &crtc->state->adjusted_mode;
-       struct dcss_soc *dcss = dev_get_drvdata(dcss_crtc->dev->parent);
-       struct videomode vm;
-
-       drm_display_mode_to_videomode(mode, &vm);
-
-       pm_runtime_get_sync(dcss_crtc->dev->parent);
-
-       dcss_dtg_sync_set(dcss, &vm);
-       dcss_ss_sync_set(dcss, &vm, mode->flags & DRM_MODE_FLAG_PHSYNC,
-                        mode->flags & DRM_MODE_FLAG_PVSYNC);
-
-       pm_runtime_mark_last_busy(dcss_crtc->dev->parent);
-       pm_runtime_put_autosuspend(dcss_crtc->dev->parent);
-}
-
 static int dcss_crtc_atomic_check(struct drm_crtc *crtc,
                                  struct drm_crtc_state *state)
 {
@@ -159,9 +139,17 @@ static void dcss_crtc_enable(struct drm_crtc *crtc)
        struct dcss_crtc *dcss_crtc = container_of(crtc, struct dcss_crtc,
                                                   base);
        struct dcss_soc *dcss = dev_get_drvdata(dcss_crtc->dev->parent);
+       struct drm_display_mode *mode = &crtc->state->adjusted_mode;
+       struct videomode vm;
+
+       drm_display_mode_to_videomode(mode, &vm);
 
        pm_runtime_get_sync(dcss_crtc->dev->parent);
 
+       dcss_dtg_sync_set(dcss, &vm);
+       dcss_ss_sync_set(dcss, &vm, mode->flags & DRM_MODE_FLAG_PHSYNC,
+                        mode->flags & DRM_MODE_FLAG_PVSYNC);
+
        dcss_ss_enable(dcss, true);
        dcss_dtg_enable(dcss, true, NULL);
        dcss_ctxld_enable(dcss);
@@ -201,7 +189,6 @@ static void dcss_crtc_atomic_disable(struct drm_crtc *crtc,
 }
 
 static const struct drm_crtc_helper_funcs dcss_helper_funcs = {
-       .mode_set_nofb = dcss_crtc_mode_set_nofb,
        .atomic_check = dcss_crtc_atomic_check,
        .atomic_begin = dcss_crtc_atomic_begin,
        .atomic_flush = dcss_crtc_atomic_flush,