[PATCH v2 09/38] drm/msm/dp: separate dp_display_prepare() into its own API

[Yongxing Mou]

From: Abhinav Kumar <quic_abhin...@quicinc.com>

dp_display_prepare() only prepares the link in case its not
already ready before dp_display_enable(). Hence separate it into
its own API.

Signed-off-by: Abhinav Kumar <quic_abhin...@quicinc.com>
Signed-off-by: Yongxing Mou <quic_yong...@quicinc.com>
---
 drivers/gpu/drm/msm/dp/dp_display.c | 18 ++++++++++++++----
 drivers/gpu/drm/msm/dp/dp_display.h |  1 +
 drivers/gpu/drm/msm/dp/dp_drm.c     |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c 
b/drivers/gpu/drm/msm/dp/dp_display.c
index 
c29ee79b4ef355e9d40ff41f8fff37e2136abb39..7ed4034c89605596c874a6bf9a5a19586d6c13fb
 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -1532,10 +1532,9 @@ int msm_dp_modeset_init(struct msm_dp *msm_dp_display, 
struct drm_device *dev,
        return 0;
 }
 
-void msm_dp_display_atomic_enable(struct msm_dp *dp)
+void msm_dp_display_atomic_prepare(struct msm_dp *dp)
 {
        int rc = 0;
-
        struct msm_dp_display_private *msm_dp_display;
 
        msm_dp_display = container_of(dp, struct msm_dp_display_private, 
msm_dp_display);
@@ -1548,10 +1547,21 @@ void msm_dp_display_atomic_enable(struct msm_dp *dp)
        rc = msm_dp_display_prepare(msm_dp_display);
        if (rc) {
                DRM_ERROR("DP display prepare failed, rc=%d\n", rc);
-               mutex_unlock(&msm_dp_display->event_mutex);
-               return;
        }
 
+       mutex_unlock(&msm_dp_display->event_mutex);
+}
+
+void msm_dp_display_atomic_enable(struct msm_dp *dp)
+{
+       int rc = 0;
+
+       struct msm_dp_display_private *msm_dp_display;
+
+       msm_dp_display = container_of(dp, struct msm_dp_display_private, 
msm_dp_display);
+
+       mutex_lock(&msm_dp_display->event_mutex);
+
        if (dp->prepared) {
                rc = msm_dp_display_enable(msm_dp_display);
                if (rc)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.h 
b/drivers/gpu/drm/msm/dp/dp_display.h
index 
8e3176e6a8af923110f414d1af5def909ef1e2c6..4e3540f2eb21afb14583b0d521dd9817fefd2f70
 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -37,6 +37,7 @@ void msm_dp_display_set_psr(struct msm_dp *dp, bool enter);
 void msm_dp_display_debugfs_init(struct msm_dp *msm_dp_display, struct dentry 
*dentry, bool is_edp);
 void msm_dp_display_atomic_post_disable(struct msm_dp *dp_display);
 void msm_dp_display_atomic_disable(struct msm_dp *dp_display);
+void msm_dp_display_atomic_prepare(struct msm_dp *dp_display);
 void msm_dp_display_atomic_enable(struct msm_dp *dp_display);
 void msm_dp_display_mode_set(struct msm_dp *dp,
                             const struct drm_display_mode *mode,
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index 
c8ca8ba470cfe4fed618a3da05c1eb662257ad95..f0144cf3c5876d94c44a44adad766f242609113e
 100644
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -105,6 +105,7 @@ static void msm_dp_bridge_atomic_enable(struct drm_bridge 
*drm_bridge,
        struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge);
        struct msm_dp *dp = dp_bridge->msm_dp_display;
 
+       msm_dp_display_atomic_prepare(dp);
        msm_dp_display_atomic_enable(dp);
 }
 
@@ -214,6 +215,7 @@ static void msm_edp_bridge_atomic_enable(struct drm_bridge 
*drm_bridge,
                return;
        }
 
+       msm_dp_display_atomic_prepare(dp);
        msm_dp_display_atomic_enable(dp);
 }
 

-- 
2.34.1