1 files changed, 86 insertions, 15 deletions

diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c
index aa6b6ce56891..75dd65c57e74 100644
--- a/drivers/gpu/drm/tinydrm/mipi-dbi.c
+++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c
@@ -271,21 +271,16 @@ static const struct drm_framebuffer_funcs mipi_dbi_fb_funcs = {
 };
 
 /**
- * mipi_dbi_pipe_enable - MIPI DBI pipe enable helper
- * @pipe: Display pipe
- * @crtc_state: CRTC state
+ * mipi_dbi_enable_flush - MIPI DBI enable helper
+ * @mipi: MIPI DBI structure
  *
- * This function enables backlight. Drivers can use this as their
+ * This function sets &mipi_dbi->enabled, flushes the whole framebuffer and
+ * enables the backlight. Drivers can use this in their
  * &drm_simple_display_pipe_funcs->enable callback.
  */
-void mipi_dbi_pipe_enable(struct drm_simple_display_pipe *pipe,
-                          struct drm_crtc_state *crtc_state)
+void mipi_dbi_enable_flush(struct mipi_dbi *mipi)
 {
-        struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-        struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
-        struct drm_framebuffer *fb = pipe->plane.fb;
-
-        DRM_DEBUG_KMS("\n");
+        struct drm_framebuffer *fb = mipi->tinydrm.pipe.plane.fb;
 
         mipi->enabled = true;
         if (fb)
@@ -293,7 +288,7 @@ void mipi_dbi_pipe_enable(struct drm_simple_display_pipe *pipe,
 
         tinydrm_enable_backlight(mipi->backlight);
 }
-EXPORT_SYMBOL(mipi_dbi_pipe_enable);
+EXPORT_SYMBOL(mipi_dbi_enable_flush);
 
 static void mipi_dbi_blank(struct mipi_dbi *mipi)
 {
@@ -316,8 +311,8 @@ static void mipi_dbi_blank(struct mipi_dbi *mipi)
  * mipi_dbi_pipe_disable - MIPI DBI pipe disable helper
  * @pipe: Display pipe
  *
- * This function disables backlight if present or if not the
- * display memory is blanked. Drivers can use this as their
+ * This function disables backlight if present, if not the display memory is
+ * blanked. The regulator is disabled if in use. Drivers can use this as their
  * &drm_simple_display_pipe_funcs->disable callback.
  */
 void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe)
@@ -333,6 +328,9 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe)
                 tinydrm_disable_backlight(mipi->backlight);
         else
                 mipi_dbi_blank(mipi);
+
+        if (mipi->regulator)
+                regulator_disable(mipi->regulator);
 }
 EXPORT_SYMBOL(mipi_dbi_pipe_disable);
 
@@ -416,7 +414,7 @@ void mipi_dbi_hw_reset(struct mipi_dbi *mipi)
                 return;
 
         gpiod_set_value_cansleep(mipi->reset, 0);
-        msleep(20);
+        usleep_range(20, 1000);
         gpiod_set_value_cansleep(mipi->reset, 1);
         msleep(120);
 }
@@ -443,6 +441,7 @@ bool mipi_dbi_display_is_on(struct mipi_dbi *mipi)
 
         val &= ~DCS_POWER_MODE_RESERVED_MASK;
 
+        /* The poweron/reset value is 08h DCS_POWER_MODE_DISPLAY_NORMAL_MODE */
         if (val != (DCS_POWER_MODE_DISPLAY |
             DCS_POWER_MODE_DISPLAY_NORMAL_MODE | DCS_POWER_MODE_SLEEP_MODE))
                 return false;
@@ -453,6 +452,78 @@ bool mipi_dbi_display_is_on(struct mipi_dbi *mipi)
 }
 EXPORT_SYMBOL(mipi_dbi_display_is_on);
 
+static int mipi_dbi_poweron_reset_conditional(struct mipi_dbi *mipi, bool cond)
+{
+        struct device *dev = mipi->tinydrm.drm->dev;
+        int ret;
+
+        if (mipi->regulator) {
+                ret = regulator_enable(mipi->regulator);
+                if (ret) {
+                        DRM_DEV_ERROR(dev, "Failed to enable regulator (%d)\n", ret);
+                        return ret;
+                }
+        }
+
+        if (cond && mipi_dbi_display_is_on(mipi))
+                return 1;
+
+        mipi_dbi_hw_reset(mipi);
+        ret = mipi_dbi_command(mipi, MIPI_DCS_SOFT_RESET);
+        if (ret) {
+                DRM_DEV_ERROR(dev, "Failed to send reset command (%d)\n", ret);
+                if (mipi->regulator)
+                        regulator_disable(mipi->regulator);
+                return ret;
+        }
+
+        /*
+         * If we did a hw reset, we know the controller is in Sleep mode and
+         * per MIPI DSC spec should wait 5ms after soft reset. If we didn't,
+         * we assume worst case and wait 120ms.
+         */
+        if (mipi->reset)
+                usleep_range(5000, 20000);
+        else
+                msleep(120);
+
+        return 0;
+}
+
+/**
+ * mipi_dbi_poweron_reset - MIPI DBI poweron and reset
+ * @mipi: MIPI DBI structure
+ *
+ * This function enables the regulator if used and does a hardware and software
+ * reset.
+ *
+ * Returns:
+ * Zero on success, or a negative error code.
+ */
+int mipi_dbi_poweron_reset(struct mipi_dbi *mipi)
+{
+        return mipi_dbi_poweron_reset_conditional(mipi, false);
+}
+EXPORT_SYMBOL(mipi_dbi_poweron_reset);
+
+/**
+ * mipi_dbi_poweron_conditional_reset - MIPI DBI poweron and conditional reset
+ * @mipi: MIPI DBI structure
+ *
+ * This function enables the regulator if used and if the display is off, it
+ * does a hardware and software reset. If mipi_dbi_display_is_on() determines
+ * that the display is on, no reset is performed.
+ *
+ * Returns:
+ * Zero if the controller was reset, 1 if the display was already on, or a
+ * negative error code.
+ */
+int mipi_dbi_poweron_conditional_reset(struct mipi_dbi *mipi)
+{
+        return mipi_dbi_poweron_reset_conditional(mipi, true);
+}
+EXPORT_SYMBOL(mipi_dbi_poweron_conditional_reset);
+
 #if IS_ENABLED(CONFIG_SPI)
 
 /**