Merge tag 'hwlock-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux.git] / drivers / gpu / drm / stm / ltdc.c

diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index 5b51298921cf18675c70f7a624fba8921719001b..c2815e8ae1da2a2301f00f5586514e5decdc18e6 100644 (file)
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -437,9 +437,6 @@ static void ltdc_crtc_atomic_enable(struct drm_crtc *crtc,
        /* Commit shadow registers = update planes at next vblank */
        reg_set(ldev->regs, LTDC_SRCR, SRCR_VBR);
 
-       /* Enable LTDC */
-       reg_set(ldev->regs, LTDC_GCR, GCR_LTDCEN);
-
        drm_crtc_vblank_on(crtc);
 }
 
@@ -453,9 +450,6 @@ static void ltdc_crtc_atomic_disable(struct drm_crtc *crtc,
 
        drm_crtc_vblank_off(crtc);
 
-       /* disable LTDC */
-       reg_clear(ldev->regs, LTDC_GCR, GCR_LTDCEN);
-
        /* disable IRQ */
        reg_clear(ldev->regs, LTDC_IER, IER_RRIE | IER_FUIE | IER_TERRIE);
 
@@ -1044,14 +1038,31 @@ static const struct drm_encoder_funcs ltdc_encoder_funcs = {
 static void ltdc_encoder_disable(struct drm_encoder *encoder)
 {
        struct drm_device *ddev = encoder->dev;
+       struct ltdc_device *ldev = ddev->dev_private;
 
        DRM_DEBUG_DRIVER("\n");
 
+       /* Disable LTDC */
+       reg_clear(ldev->regs, LTDC_GCR, GCR_LTDCEN);
+
        /* Set to sleep state the pinctrl whatever type of encoder */
        pinctrl_pm_select_sleep_state(ddev->dev);
 }
 
 static void ltdc_encoder_enable(struct drm_encoder *encoder)
+{
+       struct drm_device *ddev = encoder->dev;
+       struct ltdc_device *ldev = ddev->dev_private;
+
+       DRM_DEBUG_DRIVER("\n");
+
+       /* Enable LTDC */
+       reg_set(ldev->regs, LTDC_GCR, GCR_LTDCEN);
+}
+
+static void ltdc_encoder_mode_set(struct drm_encoder *encoder,
+                                 struct drm_display_mode *mode,
+                                 struct drm_display_mode *adjusted_mode)
 {
        struct drm_device *ddev = encoder->dev;
 
@@ -1069,6 +1080,7 @@ static void ltdc_encoder_enable(struct drm_encoder *encoder)
 static const struct drm_encoder_helper_funcs ltdc_encoder_helper_funcs = {
        .disable = ltdc_encoder_disable,
        .enable = ltdc_encoder_enable,
+       .mode_set = ltdc_encoder_mode_set,
 };
 
 static int ltdc_encoder_init(struct drm_device *ddev, struct drm_bridge *bridge)