[Intel-gfx] [PATCH 05/18] drm/i915/dsi: Add intel_dsi_unprepare() helper

[Hans de Goede]

The enable path has an intel_dsi_prepare() helper which prepares various
registers for the mode-set. Move the function undoing this to a new
intel_dsi_unprepare() helper for better symmetry between the enable and
disable paths. No functional changes.

Signed-off-by: Hans de Goede <hdego...@redhat.com>
---
 drivers/gpu/drm/i915/intel_dsi.c | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index b33381a..967bae9 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -510,6 +510,7 @@ static void intel_dsi_port_disable(struct intel_encoder 
*encoder)
 
 static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
                              struct intel_crtc_state *pipe_config);
+static void intel_dsi_unprepare(struct intel_encoder *encoder);
 
 static void intel_dsi_pre_enable(struct intel_encoder *encoder,
                                 struct intel_crtc_state *pipe_config,
@@ -652,7 +653,6 @@ static void intel_dsi_post_disable(struct intel_encoder 
*encoder,
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
        struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
        enum port port;
-       u32 temp;
 
        DRM_DEBUG_KMS("\n");
 
@@ -664,19 +664,7 @@ static void intel_dsi_post_disable(struct intel_encoder 
*encoder,
                usleep_range(2000, 5000);
        }
 
-       for_each_dsi_port(port, intel_dsi->ports) {
-               /* Panel commands can be sent when clock is in LP11 */
-               I915_WRITE(MIPI_DEVICE_READY(port), 0x0);
-
-               intel_dsi_reset_clocks(encoder, port);
-               I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP);
-
-               temp = I915_READ(MIPI_DSI_FUNC_PRG(port));
-               temp &= ~VID_MODE_FORMAT_MASK;
-               I915_WRITE(MIPI_DSI_FUNC_PRG(port), temp);
-
-               I915_WRITE(MIPI_DEVICE_READY(port), 0x1);
-       }
+       intel_dsi_unprepare(encoder);
 
        /*
         * if disable packets are sent before sending shutdown packet then in
@@ -1272,6 +1260,28 @@ static void intel_dsi_prepare(struct intel_encoder 
*intel_encoder,
        }
 }
 
+static void intel_dsi_unprepare(struct intel_encoder *encoder)
+{
+       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+       struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
+       enum port port;
+       u32 temp;
+
+       for_each_dsi_port(port, intel_dsi->ports) {
+               /* Panel commands can be sent when clock is in LP11 */
+               I915_WRITE(MIPI_DEVICE_READY(port), 0x0);
+
+               intel_dsi_reset_clocks(encoder, port);
+               I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP);
+
+               temp = I915_READ(MIPI_DSI_FUNC_PRG(port));
+               temp &= ~VID_MODE_FORMAT_MASK;
+               I915_WRITE(MIPI_DSI_FUNC_PRG(port), temp);
+
+               I915_WRITE(MIPI_DEVICE_READY(port), 0x1);
+       }
+}
+
 static enum drm_connector_status
 intel_dsi_detect(struct drm_connector *connector, bool force)
 {
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx