From: Abhinav Kumar <quic_abhin...@quicinc.com>
Move the link related operations to dp_display_unprepare() and keep
only stream related operations in dp_display_disable().
Make dp_display_unprepare() available to other clients such as DP MST.
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 | 34 ++++++++++++++++++----------------
drivers/gpu/drm/msm/dp/dp_display.h | 2 ++
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
b/drivers/gpu/drm/msm/dp/dp_display.c
index
68c74f30255d96f13ead817b69f481f41d53eec6..ea6113d1138b382f69d726cb16ceb04d82cbbe3b
100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -934,18 +934,7 @@ static int msm_dp_display_disable(struct
msm_dp_display_private *dp,
msm_dp_ctrl_clear_vsc_sdp_pkt(dp->ctrl, msm_dp_panel);
- /* dongle is still connected but sinks are disconnected */
- if (dp->link->sink_count == 0) {
- msm_dp_ctrl_psm_config(dp->ctrl);
- msm_dp_ctrl_off_pixel_clk(dp->ctrl, dp->panel->stream_id);
- msm_dp_ctrl_off_link(dp->ctrl);
- /* re-init the PHY so that we can listen to Dongle disconnect */
- msm_dp_ctrl_reinit_phy(dp->ctrl);
- } else {
- msm_dp_ctrl_off_pixel_clk(dp->ctrl, dp->panel->stream_id);
- msm_dp_ctrl_off_link(dp->ctrl);
- msm_dp_display_host_phy_exit(dp);
- }
+ msm_dp_ctrl_off_pixel_clk(dp->ctrl, dp->panel->stream_id);
msm_dp_display->power_on = false;
@@ -961,7 +950,6 @@ int msm_dp_display_set_stream_info(struct msm_dp *dp,
struct msm_dp_panel *panel
struct msm_dp_display_private *msm_dp_display;
const int max_slots = 64;
-
msm_dp_display = container_of(dp, struct msm_dp_display_private,
msm_dp_display);
if (!msm_dp_display) {
@@ -1665,15 +1653,29 @@ void msm_dp_display_atomic_disable(struct msm_dp
*msm_dp)
msm_dp_display_disable_helper(msm_dp, msm_dp_display->panel);
}
-static void msm_dp_display_unprepare(struct msm_dp_display_private
*msm_dp_display_priv)
+void msm_dp_display_unprepare(struct msm_dp *msm_dp)
{
- struct msm_dp *msm_dp = &msm_dp_display_priv->msm_dp_display;
+ struct msm_dp_display_private *msm_dp_display;
+
+ msm_dp_display = container_of(msm_dp, struct msm_dp_display_private,
msm_dp_display);
if (!msm_dp->prepared) {
drm_dbg_dp(msm_dp->drm_dev, "Link already setup, return\n");
return;
}
+ /* dongle is still connected but sinks are disconnected */
+ if (msm_dp_display->link->sink_count == 0)
+ msm_dp_ctrl_psm_config(msm_dp_display->ctrl);
+
+ msm_dp_ctrl_off_link(msm_dp_display->ctrl);
+
+ /* re-init the PHY so that we can listen to Dongle disconnect */
+ if (msm_dp_display->link->sink_count == 0)
+ msm_dp_ctrl_reinit_phy(msm_dp_display->ctrl);
+ else
+ msm_dp_display_host_phy_exit(msm_dp_display);
+
pm_runtime_put_sync(&msm_dp->pdev->dev);
msm_dp->prepared = false;
@@ -1719,7 +1721,7 @@ void msm_dp_display_atomic_post_disable(struct msm_dp
*msm_dp)
msm_dp_display_atomic_post_disable_helper(msm_dp,
msm_dp_display->panel);
- msm_dp_display_unprepare(msm_dp_display);
+ msm_dp_display_unprepare(msm_dp);
}
void msm_dp_display_mode_set_helper(struct msm_dp *msm_dp,
diff --git a/drivers/gpu/drm/msm/dp/dp_display.h
b/drivers/gpu/drm/msm/dp/dp_display.h
index
96fec50601400ca44d1cdd310f2353e301874099..0b73087cbc421b4d2b895033f17892189ef68cb2
100644
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -58,4 +58,6 @@ void msm_dp_display_mode_set_helper(struct msm_dp *msm_dp,
void msm_dp_display_atomic_post_disable_helper(struct msm_dp *msm_dp,
struct msm_dp_panel
*msm_dp_panel);
+void msm_dp_display_unprepare(struct msm_dp *dp);
+
#endif /* _DP_DISPLAY_H_ */
--
2.34.1
