Re: [PATCH v2 04/38] drm/msm/dp: re-arrange dp_display_disable() into functional parts

[Yongxing Mou]

On 2025/6/9 21:05, Dmitry Baryshkov wrote:

On Mon, Jun 09, 2025 at 08:21:23PM +0800, Yongxing Mou wrote:

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

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_abhin...@quicinc.com>
Signed-off-by: Yongxing Mou <quic_yong...@quicinc.com>
---
  drivers/gpu/drm/msm/dp/dp_ctrl.c    | 29 +++++++++++++++--------------
  drivers/gpu/drm/msm/dp/dp_ctrl.h    |  5 ++++-
  drivers/gpu/drm/msm/dp/dp_display.c | 16 +++++++---------
  3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c
index 
1e13ca81b0155a37a4ed7a2e83c918293d703a37..1ce3cca121d0c56b493e282c76eb9202371564cf
 100644
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
@@ -2081,30 +2081,31 @@ 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_clear_vsc_sdp_pkt(struct msm_dp_ctrl *msm_dp_ctrl)
  {
        struct msm_dp_ctrl_private *ctrl;
-       struct phy *phy;

ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, msm_dp_ctrl);

-       phy = ctrl->phy;
-
        msm_dp_catalog_panel_disable_vsc_sdp(ctrl->catalog);
+}

- /* set dongle to D3 (power off) mode */

-       msm_dp_link_psm_config(ctrl->link, &ctrl->panel->link_info, true);
+void msm_dp_ctrl_psm_config(struct msm_dp_ctrl *msm_dp_ctrl)

I'm not a fan of (almost) one-line wrappers.
after reabse to latest code. Here can remove wrappers..

+{
+       struct msm_dp_ctrl_private *ctrl;

- msm_dp_catalog_ctrl_mainlink_ctrl(ctrl->catalog, false);

+       ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, 
msm_dp_ctrl);

- if (ctrl->stream_clks_on) {

-               clk_disable_unprepare(ctrl->pixel_clk);
-               ctrl->stream_clks_on = false;
-       }
+       /* set dongle to D3 (power off) mode */
+       msm_dp_link_psm_config(ctrl->link, &ctrl->panel->link_info, true);
+}

- dev_pm_opp_set_rate(ctrl->dev, 0);

-       msm_dp_ctrl_link_clk_disable(&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;

- phy_power_off(phy);

+       ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, 
msm_dp_ctrl);
+       phy = ctrl->phy;

/* aux channel down, reinit phy */

        phy_exit(phy);
diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h
index 
42745c912adbad7221c78f5cecefa730bfda1e75..edbe5766db74c4e4179141d895f9cb85e514f29b
 100644
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.h
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h
@@ -20,7 +20,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 *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_link(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);
@@ -42,4 +41,8 @@ void msm_dp_ctrl_config_psr(struct msm_dp_ctrl *msm_dp_ctrl);
  int msm_dp_ctrl_core_clk_enable(struct msm_dp_ctrl *msm_dp_ctrl);
  void msm_dp_ctrl_core_clk_disable(struct msm_dp_ctrl *msm_dp_ctrl);

+void msm_dp_ctrl_clear_vsc_sdp_pkt(struct msm_dp_ctrl *msm_dp_ctrl);

+void msm_dp_ctrl_psm_config(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 
5ac5dcf35b789f2bda052a2c17aae20aa48d8e18..a5ca498cb970d0c6a4095b0b7fc6269c2dc3ad31
 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -925,17 +925,15 @@ static int msm_dp_display_disable(struct 
msm_dp_display_private *dp)
        if (!msm_dp_display->power_on)
                return 0;

+ msm_dp_ctrl_clear_vsc_sdp_pkt(dp->ctrl);

+
+       /* 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);
+               msm_dp_ctrl_psm_config(dp->ctrl);
+               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
-                * dongle unplugged out of DUT
-                */
                msm_dp_ctrl_off(dp->ctrl);
                msm_dp_display_host_phy_exit(dp);
        }

--
2.34.1