drm/pl111: Insert delay before powering up PL11x

The old codebase has a delay between enabling and powering up the
PL11x.

According to the manual for PL110, ARM DDI 0161E page 1-5 and
the PL111 manual ARM DDI 0293C page 1-6, the power sequence should
be such that once Vdd is stable (which we assume it is at boot)
LCDEN is enabled first and then CLPOWER should be enabled
"after the signals have stabilized" and this is said to
be display-dependent. The old codebase uses 20ms.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20170908124709.4758-5-linus.walleij@linaro.org

diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c
index c08706be4b7ee3bdaa6ee724e74be19537d45f79..3091fb4559cfa8a820e7bc4c4d5bf7c6f33a2a3a 100644 (file)
--- a/drivers/gpu/drm/pl111/pl111_display.c
+++ b/drivers/gpu/drm/pl111/pl111_display.c
@@ -155,8 +155,8 @@ static void pl111_display_enable(struct drm_simple_display_pipe *pipe,
 
        writel(0, priv->regs + CLCD_TIM3);
 
-       /* Enable and Power Up */
-       cntl = CNTL_LCDEN | CNTL_LCDTFT | CNTL_LCDPWR | CNTL_LCDVCOMP(1);
+       /* Hard-code TFT panel */
+       cntl = CNTL_LCDEN | CNTL_LCDTFT | CNTL_LCDVCOMP(1);
 
        /* Note that the the hardware's format reader takes 'r' from
         * the low bit, while DRM formats list channels from high bit
@@ -199,6 +199,17 @@ static void pl111_display_enable(struct drm_simple_display_pipe *pipe,
                break;
        }
 
+       /* Power sequence: first enable and chill */
+       writel(cntl, priv->regs + priv->ctrl);
+
+       /*
+        * We expect this delay to stabilize the contrast
+        * voltage Vee as stipulated by the manual
+        */
+       msleep(20);
+
+       /* Power Up */
+       cntl |= CNTL_LCDPWR;
        writel(cntl, priv->regs + priv->ctrl);
 
        drm_crtc_vblank_on(crtc);
@@ -209,10 +220,24 @@ void pl111_display_disable(struct drm_simple_display_pipe *pipe)
        struct drm_crtc *crtc = &pipe->crtc;
        struct drm_device *drm = crtc->dev;
        struct pl111_drm_dev_private *priv = drm->dev_private;
+       u32 cntl;
 
        drm_crtc_vblank_off(crtc);
 
-       /* Disable and Power Down */
+       /* Power Down */
+       cntl = readl(priv->regs + priv->ctrl);
+       if (cntl & CNTL_LCDPWR) {
+               cntl &= ~CNTL_LCDPWR;
+               writel(cntl, priv->regs + priv->ctrl);
+       }
+
+       /*
+        * We expect this delay to stabilize the contrast voltage Vee as
+        * stipulated by the manual
+        */
+       msleep(20);
+
+       /* Disable */
        writel(0, priv->regs + priv->ctrl);
 
        clk_disable_unprepare(priv->clk);