drm/msm/dp: re-arrange dp_display_disable() into functional parts

dp_display_disable() handles special case of when monitor is
disconnected from the dongle while the dongle stays connected
thereby needing a separate function dp_ctrl_off_link_stream()
for this. However with a slight rework this can still be handled
by keeping common paths same for regular and special case.

Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Yongxing Mou <yongxing.mou@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/742742/
Link: https://lore.kernel.org/r/20260728-dp_mstclean-v9-9-f7779fce10f4@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c
index 43094dda34349bd589374f116418d4573de67cbc..272ac3b25b13447b43b244b83c39e0f852547760 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
@@ -2605,7 +2605,7 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl)
        return ret;
 }
 
-void msm_dp_ctrl_off_link_stream(struct msm_dp_ctrl *msm_dp_ctrl)
+void msm_dp_ctrl_reinit_phy(struct msm_dp_ctrl *msm_dp_ctrl)
 {
        struct msm_dp_ctrl_private *ctrl;
        struct phy *phy;
@@ -2613,23 +2613,6 @@ void msm_dp_ctrl_off_link_stream(struct msm_dp_ctrl *msm_dp_ctrl)
        ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, msm_dp_ctrl);
        phy = ctrl->phy;
 
-       msm_dp_panel_disable_vsc_sdp(ctrl->panel);
-
-       /* set dongle to D3 (power off) mode */
-       msm_dp_link_psm_config(ctrl->link, &ctrl->panel->link_info, true);
-
-       msm_dp_ctrl_mainlink_disable(ctrl);
-
-       if (ctrl->stream_clks_on) {
-               clk_disable_unprepare(ctrl->pixel_clk);
-               ctrl->stream_clks_on = false;
-       }
-
-       dev_pm_opp_set_rate(ctrl->dev, 0);
-       msm_dp_ctrl_link_clk_disable(&ctrl->msm_dp_ctrl);
-
-       phy_power_off(phy);
-
        /* aux channel down, reinit phy */
        phy_exit(phy);
        phy_init(phy);

diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h
index 1497f1a8fc2f00991356663c19c87eb9fad48a73..5d615f50d13bf8a30b5c4a69f6dbc44a3d534dbc 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.h
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h
@@ -19,7 +19,6 @@ struct phy;
 int msm_dp_ctrl_on_link(struct msm_dp_ctrl *msm_dp_ctrl);
 int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl);
 int msm_dp_ctrl_prepare_stream_on(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_train);
-void msm_dp_ctrl_off_link_stream(struct msm_dp_ctrl *msm_dp_ctrl);
 void msm_dp_ctrl_off(struct msm_dp_ctrl *msm_dp_ctrl);
 void msm_dp_ctrl_push_idle(struct msm_dp_ctrl *msm_dp_ctrl);
 irqreturn_t msm_dp_ctrl_isr(struct msm_dp_ctrl *msm_dp_ctrl);
@@ -46,4 +45,5 @@ void msm_dp_ctrl_core_clk_disable(struct msm_dp_ctrl *msm_dp_ctrl);
 void msm_dp_ctrl_enable_irq(struct msm_dp_ctrl *msm_dp_ctrl);
 void msm_dp_ctrl_disable_irq(struct msm_dp_ctrl *msm_dp_ctrl);
 
+void msm_dp_ctrl_reinit_phy(struct msm_dp_ctrl *msm_dp_ctrl);
 #endif /* _DP_CTRL_H_ */

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index e2b4f02767377a0ef5f76cbdde272bef0e184bfb..f8f8f3889ea505ad0fb587e8db8d9cad97a4b6e2 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -716,12 +716,20 @@ static int msm_dp_display_disable(struct msm_dp_display_private *dp)
        if (!msm_dp_display->power_on)
                return 0;
 
+       msm_dp_panel_disable_vsc_sdp(dp->panel);
+
+       /* dongle is still connected but sinks are disconnected */
        if (dp->link->sink_count == 0) {
                /*
                 * irq_hpd with sink_count = 0
                 * hdmi unplugged out of dongle
                 */
-               msm_dp_ctrl_off_link_stream(dp->ctrl);
+
+               /* set dongle to D3 (power off) mode */
+               msm_dp_link_psm_config(dp->link, &dp->panel->link_info, true);
+               msm_dp_ctrl_off(dp->ctrl);
+               /* re-init the PHY so that we can listen to Dongle disconnect */
+               msm_dp_ctrl_reinit_phy(dp->ctrl);
        } else {
                /*
                 * unplugged interrupt