On Mon, Aug 25, 2025 at 10:16:09PM +0800, Yongxing Mou wrote:
> From: Abhinav Kumar <quic_abhin...@quicinc.com>
>
> Currently the dp_display bridge helpers, in particular the
> dp_display_enable()/dp_display_disable() use the cached panel.
> To be able to re-use these helpers for MST use-case abstract the
> helpers to use the panel which is passed in to them.
>
> Signed-off-by: Abhinav Kumar <quic_abhin...@quicinc.com>
> Signed-off-by: Yongxing Mou <yongxing....@oss.qualcomm.com>
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 138
> +++++++++++++++++++++++-------------
> drivers/gpu/drm/msm/dp/dp_display.h | 12 ++++
> 2 files changed, 102 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index
> e02ada7a3dc3b89618aeadd998e9a41236ee6bbf..0815973e6597492e09f33359d9777c0e8ce31e0d
> 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -695,6 +695,11 @@ static int msm_dp_display_prepare(struct
> msm_dp_display_private *dp)
>
> drm_dbg_dp(dp->drm_dev, "sink_count=%d\n", dp->link->sink_count);
>
> + if (msm_dp_display->prepared) {
Why is it a part of this patch?
> + drm_dbg_dp(dp->drm_dev, "Link already setup, return\n");
> + return 0;
> + }
> +
> rc = pm_runtime_resume_and_get(&msm_dp_display->pdev->dev);
> if (rc) {
> DRM_ERROR("failed to pm_runtime_resume\n");
> @@ -722,7 +727,8 @@ static int msm_dp_display_prepare(struct
> msm_dp_display_private *dp)
> return rc;
> }
>
> -static int msm_dp_display_enable(struct msm_dp_display_private *dp)
> +static int msm_dp_display_enable(struct msm_dp_display_private *dp,
> + struct msm_dp_panel *msm_dp_panel)
These changes look fine, but they raise an interesting question: should
we rework the interface, making the msm_dp_panel the top-level object,
which then controls the ctrl, link, etc.?
> {
> int rc = 0;
> struct msm_dp *msm_dp_display = &dp->msm_dp_display;
> @@ -733,7 +739,7 @@ static int msm_dp_display_enable(struct
> msm_dp_display_private *dp)
> return 0;
> }
>
> - rc = msm_dp_ctrl_on_stream(dp->ctrl, dp->panel, dp->max_stream);
> + rc = msm_dp_ctrl_on_stream(dp->ctrl, msm_dp_panel, dp->max_stream);
> if (!rc)
> msm_dp_display->power_on = true;
>
> @@ -779,37 +785,17 @@ static void msm_dp_display_audio_notify_disable(struct
> msm_dp_display_private *d
> msm_dp_display->audio_enabled = false;
> }
>
> -static int msm_dp_display_disable(struct msm_dp_display_private *dp)
> +static int msm_dp_display_disable(struct msm_dp_display_private *dp,
> + struct msm_dp_panel *msm_dp_panel)
> {
> struct msm_dp *msm_dp_display = &dp->msm_dp_display;
>
> if (!msm_dp_display->power_on)
> return 0;
>
> - msm_dp_panel_disable_vsc_sdp(dp->panel);
> + msm_dp_panel_disable_vsc_sdp(msm_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
> - */
> -
> - /* set dongle to D3 (power off) mode */
> - msm_dp_link_psm_config(dp->link, &dp->panel->link_info, true);
> - 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 {
> - /*
> - * unplugged interrupt
> - * dongle unplugged out of DUT
> - */
> - 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, msm_dp_panel->stream_id);
This doesn't seems to be a part of this patch. Maybe move it to the
previous patch, reworking this piece of code?
>
> msm_dp_display->power_on = false;
>
> @@ -1538,52 +1524,90 @@ void msm_dp_display_atomic_prepare(struct msm_dp
> *msm_dp_display)
> return;
> }
>
> -void msm_dp_display_atomic_enable(struct msm_dp *msm_dp_display)
> +void msm_dp_display_enable_helper(struct msm_dp *msm_dp_display, struct
> msm_dp_panel *msm_dp_panel)
> {
> struct msm_dp_display_private *dp;
> int rc = 0;
>
> dp = container_of(msm_dp_display, struct msm_dp_display_private,
> msm_dp_display);
>
> - msm_dp_display_set_stream_info(msm_dp_display, dp->panel, 0, 0, 0, 0,
> 0);
> -
Please, don't mix different kinds of refactoring. You've promised to
bring in msm_dp_panel as an argument, but then you are also
restructuring functions. Try making your changes more logical or atomic.
> if (msm_dp_display->prepared) {
> - rc = msm_dp_display_enable(dp);
> + rc = msm_dp_display_enable(dp, msm_dp_panel);
> if (rc)
> DRM_ERROR("DP display enable failed, rc=%d\n", rc);
>
> rc = msm_dp_display_post_enable(msm_dp_display);
> if (rc) {
> DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
> - msm_dp_display_disable(dp);
> + msm_dp_display_disable(dp, msm_dp_panel);
> }
> }
>
> drm_dbg_dp(msm_dp_display->drm_dev, "type=%d Done\n",
> msm_dp_display->connector_type);
> }
>
> -void msm_dp_display_atomic_disable(struct msm_dp *msm_dp_display)
> +void msm_dp_display_atomic_enable(struct msm_dp *msm_dp_display)
> {
> struct msm_dp_display_private *dp;
>
> dp = container_of(msm_dp_display, struct msm_dp_display_private,
> msm_dp_display);
>
> - msm_dp_ctrl_push_idle(dp->ctrl, dp->panel);
> + msm_dp_display_set_stream_info(msm_dp_display, dp->panel, 0, 0, 0, 0,
> 0);
> +
> + msm_dp_display_enable_helper(msm_dp_display, dp->panel);
> +}
> +
> +void msm_dp_display_disable_helper(struct msm_dp *msm_dp_display,
> + struct msm_dp_panel *msm_dp_panel)
> +{
> + struct msm_dp_display_private *dp;
> +
> + dp = container_of(msm_dp_display, struct msm_dp_display_private,
> msm_dp_display);
> +
> + msm_dp_ctrl_push_idle(dp->ctrl, msm_dp_panel);
> msm_dp_ctrl_mst_stream_channel_slot_setup(dp->ctrl,
> dp->max_stream);
> msm_dp_ctrl_mst_send_act(dp->ctrl);
> }
>
> -static void msm_dp_display_unprepare(struct msm_dp_display_private *dp)
> +void msm_dp_display_atomic_disable(struct msm_dp *msm_dp_display)
> {
> - struct msm_dp *msm_dp_display = &dp->msm_dp_display;
> + struct msm_dp_display_private *dp;
> +
> + dp = container_of(msm_dp_display, struct msm_dp_display_private,
> msm_dp_display);
> +
> + msm_dp_display_disable_helper(msm_dp_display, dp->panel);
> +}
> +
> +void msm_dp_display_unprepare(struct msm_dp *msm_dp_display)
> +{
> + struct msm_dp_display_private *dp;
> +
> + dp = container_of(msm_dp_display, struct msm_dp_display_private,
> msm_dp_display);
> +
> + if (!msm_dp_display->prepared) {
> + drm_dbg_dp(dp->drm_dev, "Link already setup, return\n");
> + return;
> + }
> +
> + /* dongle is still connected but sinks are disconnected */
> + if (dp->link->sink_count == 0)
> + msm_dp_link_psm_config(dp->link, &dp->panel->link_info, true);
> +
> + msm_dp_ctrl_off_link(dp->ctrl);
> +
> + /* re-init the PHY so that we can listen to Dongle disconnect */
> + if (dp->link->sink_count == 0)
> + msm_dp_ctrl_reinit_phy(dp->ctrl);
> + else
> + msm_dp_display_host_phy_exit(dp);
>
> pm_runtime_put_sync(&msm_dp_display->pdev->dev);
>
> msm_dp_display->prepared = false;
> }
>
> -void msm_dp_display_atomic_post_disable(struct msm_dp *dp)
> +void msm_dp_display_atomic_post_disable_helper(struct msm_dp *dp, struct
> msm_dp_panel *msm_dp_panel)
> {
> struct msm_dp_display_private *msm_dp_display;
>
> @@ -1597,28 +1621,46 @@ void msm_dp_display_atomic_post_disable(struct msm_dp
> *dp)
>
> msm_dp_display_audio_notify_disable(msm_dp_display);
>
> - msm_dp_display_disable(msm_dp_display);
> + msm_dp_display_disable(msm_dp_display, msm_dp_panel);
> +
> + drm_dbg_dp(dp->drm_dev, "type=%d Done\n", dp->connector_type);
> +}
> +
> +void msm_dp_display_atomic_post_disable(struct msm_dp *msm_dp_display)
> +{
> + struct msm_dp_display_private *dp;
> +
> + dp = container_of(msm_dp_display, struct msm_dp_display_private,
> msm_dp_display);
> +
> + msm_dp_display_atomic_post_disable_helper(msm_dp_display, dp->panel);
>
> msm_dp_display_unprepare(msm_dp_display);
> +}
>
> - drm_dbg_dp(dp->drm_dev, "type=%d Done\n", dp->connector_type);
> +void msm_dp_display_mode_set_helper(struct msm_dp *msm_dp,
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode
> *adjusted_mode,
> + struct msm_dp_panel *msm_dp_panel)
> +{
> + struct msm_dp_display_private *dp;
> +
> + dp = container_of(msm_dp, struct msm_dp_display_private,
> msm_dp_display);
> +
> + msm_dp_display_set_mode(msm_dp, adjusted_mode, msm_dp_panel);
> + /* populate wide_bus_support to different layers */
> + dp->ctrl->wide_bus_en = msm_dp_panel->msm_dp_mode.out_fmt_is_yuv_420 ?
> + false : dp->wide_bus_supported;
> }
>
> -void msm_dp_display_mode_set(struct msm_dp *dp,
> +void msm_dp_display_mode_set(struct msm_dp *msm_dp,
> const struct drm_display_mode *mode,
> const struct drm_display_mode *adjusted_mode)
> {
> - struct msm_dp_display_private *msm_dp_display;
> - struct msm_dp_panel *msm_dp_panel;
> -
> - msm_dp_display = container_of(dp, struct msm_dp_display_private,
> msm_dp_display);
> - msm_dp_panel = msm_dp_display->panel;
> + struct msm_dp_display_private *dp;
>
> - msm_dp_display_set_mode(dp, adjusted_mode, msm_dp_panel);
> + dp = container_of(msm_dp, struct msm_dp_display_private,
> msm_dp_display);
>
> - /* populate wide_bus_support to different layers */
> - msm_dp_display->ctrl->wide_bus_en =
> msm_dp_panel->msm_dp_mode.out_fmt_is_yuv_420 ?
> - false : msm_dp_display->wide_bus_supported;
> + msm_dp_display_mode_set_helper(msm_dp, mode, adjusted_mode, dp->panel);
> }
>
> void msm_dp_bridge_hpd_enable(struct drm_bridge *bridge)
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h
> b/drivers/gpu/drm/msm/dp/dp_display.h
> index
> fa92f763d2304f15af7c4e1e7e8aab5a6ffd3459..20b7ed735b3f428e894b82ae2756d0efcfa47624
> 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.h
> +++ b/drivers/gpu/drm/msm/dp/dp_display.h
> @@ -51,5 +51,17 @@ enum drm_mode_status msm_dp_display_mode_valid(struct
> msm_dp *dp,
> int msm_dp_display_set_stream_info(struct msm_dp *dp_display, struct
> msm_dp_panel *panel,
> enum msm_dp_stream_id stream_id,
> u32 start_slot, u32 num_slots, u32 pbn, int
> vcpi);
> +void msm_dp_display_enable_helper(struct msm_dp *msm_dp_display,
> + struct msm_dp_panel *msm_dp_panel);
> +void msm_dp_display_disable_helper(struct msm_dp *msm_dp_display,
> + struct msm_dp_panel *msm_dp_panel);
> +void msm_dp_display_mode_set_helper(struct msm_dp *msm_dp_display,
> + const struct drm_display_mode *mode,
> + const struct drm_display_mode
> *adjusted_mode,
> + struct msm_dp_panel *msm_dp_panel);
> +void msm_dp_display_atomic_post_disable_helper(struct msm_dp *msm_dp_display,
> + struct msm_dp_panel
> *msm_dp_panel);
> +
> +void msm_dp_display_unprepare(struct msm_dp *dp);
>
> #endif /* _DP_DISPLAY_H_ */
>
> --
> 2.34.1
>
--
With best wishes
Dmitry
