Message ID | 20241205-dp_mst-v1-24-f8618d42a99a@quicinc.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | drm/msm/dp: Add MST support for MSM chipsets | expand |
On Thu, Dec 05, 2024 at 08:31:55PM -0800, Abhinav Kumar wrote: > 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_abhinavk@quicinc.com> > --- > drivers/gpu/drm/msm/dp/dp_display.c | 96 ++++++++++++++++++++++++++----------- > drivers/gpu/drm/msm/dp/dp_display.h | 8 ++++ > 2 files changed, 75 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > index 1dfc82211c50bb4ed239f9730b91c33c4897c78f..e169cd22db960c0c30707ddbe6a79999dc2a273d 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -868,7 +868,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) > { > int rc = 0; > struct msm_dp *msm_dp_display = &dp->msm_dp_display; > @@ -879,7 +880,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; > > @@ -925,20 +926,21 @@ 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_ctrl_clear_vsc_sdp_pkt(dp->ctrl, dp->panel); > + 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_stream_clk_off(dp->ctrl, dp->panel); > + msm_dp_ctrl_stream_clk_off(dp->ctrl, msm_dp_panel); > > msm_dp_ctrl_off_link(dp->ctrl); > > @@ -1607,7 +1609,7 @@ void msm_dp_display_atomic_prepare(struct msm_dp *dp) > mutex_unlock(&msm_dp_display->event_mutex); > } > > -void msm_dp_display_atomic_enable(struct msm_dp *dp) > +void msm_dp_display_enable_helper(struct msm_dp *dp, struct msm_dp_panel *msm_dp_panel) > { > int rc = 0; > > @@ -1620,16 +1622,14 @@ void msm_dp_display_atomic_enable(struct msm_dp *dp) > > mutex_lock(&msm_dp_display->event_mutex); > > - msm_dp_display_set_stream_info(dp, msm_dp_display->panel, 0, 0, 0, 0, 0); > - Why? You have added it few patches ago. > if (dp->prepared) { > - rc = msm_dp_display_enable(msm_dp_display); > + rc = msm_dp_display_enable(msm_dp_display, msm_dp_panel); > if (rc) > DRM_ERROR("DP display enable failed, rc=%d\n", rc); > rc = msm_dp_display_post_enable(dp); > if (rc) { > DRM_ERROR("DP display post enable failed, rc=%d\n", rc); > - msm_dp_display_disable(msm_dp_display); > + msm_dp_display_disable(msm_dp_display, msm_dp_panel); > } > } > > @@ -1640,14 +1640,25 @@ void msm_dp_display_atomic_enable(struct msm_dp *dp) > mutex_unlock(&msm_dp_display->event_mutex); > } > > -void msm_dp_display_atomic_disable(struct msm_dp *dp) > +void msm_dp_display_atomic_enable(struct msm_dp *msm_dp) > +{ > + struct msm_dp_display_private *msm_dp_display; > + > + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); > + > + msm_dp_display_set_stream_info(msm_dp, msm_dp_display->panel, 0, 0, 0, 0, 0); > + > + msm_dp_display_enable_helper(msm_dp, msm_dp_display->panel); > +} > + > +void msm_dp_display_disable_helper(struct msm_dp *dp, struct msm_dp_panel *msm_dp_panel) > { > struct msm_dp_display_private *msm_dp_display; > > msm_dp_display = container_of(dp, struct msm_dp_display_private, msm_dp_display); > > if (msm_dp_display->max_stream > DEFAULT_STREAM_COUNT) > - msm_dp_ctrl_push_vcpf(msm_dp_display->ctrl, msm_dp_display->panel); > + msm_dp_ctrl_push_vcpf(msm_dp_display->ctrl, msm_dp_panel); > else > msm_dp_ctrl_push_idle(msm_dp_display->ctrl); > > @@ -1658,21 +1669,30 @@ void msm_dp_display_atomic_disable(struct msm_dp *dp) > } > } > > -static void msm_dp_display_unprepare(struct msm_dp_display_private *dp) > +void msm_dp_display_atomic_disable(struct msm_dp *msm_dp) > { > - struct msm_dp *msm_dp_display = &dp->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"); > + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); > + > + 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) > +{ > + struct msm_dp *msm_dp = &msm_dp_display_priv->msm_dp_display; > + > + if (!msm_dp->prepared) { > + drm_dbg_dp(msm_dp->drm_dev, "Link already setup, return\n"); > return; > } > > - pm_runtime_put_sync(&msm_dp_display->pdev->dev); > + pm_runtime_put_sync(&msm_dp->pdev->dev); > > - msm_dp_display->prepared = false; > + msm_dp->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) > { > u32 state; > struct msm_dp_display_private *msm_dp_display; > @@ -1691,7 +1711,7 @@ 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); > > state = msm_dp_display->hpd_state; > if (state == ST_DISCONNECT_PENDING) { > @@ -1699,25 +1719,32 @@ void msm_dp_display_atomic_post_disable(struct msm_dp *dp) > msm_dp_display->hpd_state = ST_DISCONNECTED; > } > > - msm_dp_display_unprepare(msm_dp_display); > - Please split refactoring to a separate patch. > drm_dbg_dp(dp->drm_dev, "type=%d Done\n", dp->connector_type); > > mutex_unlock(&msm_dp_display->event_mutex); > } > > -void msm_dp_display_mode_set(struct msm_dp *dp, > - const struct drm_display_mode *mode, > - const struct drm_display_mode *adjusted_mode) > +void msm_dp_display_atomic_post_disable(struct msm_dp *msm_dp) > { > 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; > + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); > + > + msm_dp_display_atomic_post_disable_helper(msm_dp, msm_dp_display->panel); > + > + msm_dp_display_unprepare(msm_dp_display); > +} > + > +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 *msm_dp_display; > > + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); > > - msm_dp_display_set_mode(dp, adjusted_mode, msm_dp_panel); > + msm_dp_display_set_mode(msm_dp, adjusted_mode, msm_dp_panel); > > /* populate wide_bus_support to different layers */ > msm_dp_display->ctrl->wide_bus_en = > @@ -1726,6 +1753,17 @@ void msm_dp_display_mode_set(struct msm_dp *dp, > msm_dp_panel->msm_dp_mode.out_fmt_is_yuv_420 ? false : msm_dp_display->wide_bus_supported; > } > > +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; > + > + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); > + > + msm_dp_display_mode_set_helper(msm_dp, mode, adjusted_mode, msm_dp_display->panel); > +} > + > void msm_dp_bridge_hpd_enable(struct drm_bridge *bridge) > { > struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(bridge); > diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h > index 258c240de580b634c05cf5895a8e52160449eba1..2b23f2bf7535d3fd513d40a8411a1903fcd560b0 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.h > +++ b/drivers/gpu/drm/msm/dp/dp_display.h > @@ -56,5 +56,13 @@ enum drm_mode_status msm_dp_display_mode_valid(struct msm_dp *dp, > int msm_dp_display_set_stream_info(struct msm_dp *dp, > struct msm_dp_panel *panel, u32 strm_id, > u32 start_slot, u32 num_slots, u32 pbn, int vcpi); > +void msm_dp_display_enable_helper(struct msm_dp *msm_dp, struct msm_dp_panel *msm_dp_panel); > +void msm_dp_display_disable_helper(struct msm_dp *msm_dp, struct msm_dp_panel *msm_dp_panel); > +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); > +void msm_dp_display_atomic_post_disable_helper(struct msm_dp *msm_dp, > + struct msm_dp_panel *msm_dp_panel); > > #endif /* _DP_DISPLAY_H_ */ > > -- > 2.34.1 >
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 1dfc82211c50bb4ed239f9730b91c33c4897c78f..e169cd22db960c0c30707ddbe6a79999dc2a273d 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -868,7 +868,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) { int rc = 0; struct msm_dp *msm_dp_display = &dp->msm_dp_display; @@ -879,7 +880,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; @@ -925,20 +926,21 @@ 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_ctrl_clear_vsc_sdp_pkt(dp->ctrl, dp->panel); + 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_stream_clk_off(dp->ctrl, dp->panel); + msm_dp_ctrl_stream_clk_off(dp->ctrl, msm_dp_panel); msm_dp_ctrl_off_link(dp->ctrl); @@ -1607,7 +1609,7 @@ void msm_dp_display_atomic_prepare(struct msm_dp *dp) mutex_unlock(&msm_dp_display->event_mutex); } -void msm_dp_display_atomic_enable(struct msm_dp *dp) +void msm_dp_display_enable_helper(struct msm_dp *dp, struct msm_dp_panel *msm_dp_panel) { int rc = 0; @@ -1620,16 +1622,14 @@ void msm_dp_display_atomic_enable(struct msm_dp *dp) mutex_lock(&msm_dp_display->event_mutex); - msm_dp_display_set_stream_info(dp, msm_dp_display->panel, 0, 0, 0, 0, 0); - if (dp->prepared) { - rc = msm_dp_display_enable(msm_dp_display); + rc = msm_dp_display_enable(msm_dp_display, msm_dp_panel); if (rc) DRM_ERROR("DP display enable failed, rc=%d\n", rc); rc = msm_dp_display_post_enable(dp); if (rc) { DRM_ERROR("DP display post enable failed, rc=%d\n", rc); - msm_dp_display_disable(msm_dp_display); + msm_dp_display_disable(msm_dp_display, msm_dp_panel); } } @@ -1640,14 +1640,25 @@ void msm_dp_display_atomic_enable(struct msm_dp *dp) mutex_unlock(&msm_dp_display->event_mutex); } -void msm_dp_display_atomic_disable(struct msm_dp *dp) +void msm_dp_display_atomic_enable(struct msm_dp *msm_dp) +{ + struct msm_dp_display_private *msm_dp_display; + + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); + + msm_dp_display_set_stream_info(msm_dp, msm_dp_display->panel, 0, 0, 0, 0, 0); + + msm_dp_display_enable_helper(msm_dp, msm_dp_display->panel); +} + +void msm_dp_display_disable_helper(struct msm_dp *dp, struct msm_dp_panel *msm_dp_panel) { struct msm_dp_display_private *msm_dp_display; msm_dp_display = container_of(dp, struct msm_dp_display_private, msm_dp_display); if (msm_dp_display->max_stream > DEFAULT_STREAM_COUNT) - msm_dp_ctrl_push_vcpf(msm_dp_display->ctrl, msm_dp_display->panel); + msm_dp_ctrl_push_vcpf(msm_dp_display->ctrl, msm_dp_panel); else msm_dp_ctrl_push_idle(msm_dp_display->ctrl); @@ -1658,21 +1669,30 @@ void msm_dp_display_atomic_disable(struct msm_dp *dp) } } -static void msm_dp_display_unprepare(struct msm_dp_display_private *dp) +void msm_dp_display_atomic_disable(struct msm_dp *msm_dp) { - struct msm_dp *msm_dp_display = &dp->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"); + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); + + 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) +{ + struct msm_dp *msm_dp = &msm_dp_display_priv->msm_dp_display; + + if (!msm_dp->prepared) { + drm_dbg_dp(msm_dp->drm_dev, "Link already setup, return\n"); return; } - pm_runtime_put_sync(&msm_dp_display->pdev->dev); + pm_runtime_put_sync(&msm_dp->pdev->dev); - msm_dp_display->prepared = false; + msm_dp->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) { u32 state; struct msm_dp_display_private *msm_dp_display; @@ -1691,7 +1711,7 @@ 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); state = msm_dp_display->hpd_state; if (state == ST_DISCONNECT_PENDING) { @@ -1699,25 +1719,32 @@ void msm_dp_display_atomic_post_disable(struct msm_dp *dp) msm_dp_display->hpd_state = ST_DISCONNECTED; } - msm_dp_display_unprepare(msm_dp_display); - drm_dbg_dp(dp->drm_dev, "type=%d Done\n", dp->connector_type); mutex_unlock(&msm_dp_display->event_mutex); } -void msm_dp_display_mode_set(struct msm_dp *dp, - const struct drm_display_mode *mode, - const struct drm_display_mode *adjusted_mode) +void msm_dp_display_atomic_post_disable(struct msm_dp *msm_dp) { 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; + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); + + msm_dp_display_atomic_post_disable_helper(msm_dp, msm_dp_display->panel); + + msm_dp_display_unprepare(msm_dp_display); +} + +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 *msm_dp_display; + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); - msm_dp_display_set_mode(dp, adjusted_mode, msm_dp_panel); + msm_dp_display_set_mode(msm_dp, adjusted_mode, msm_dp_panel); /* populate wide_bus_support to different layers */ msm_dp_display->ctrl->wide_bus_en = @@ -1726,6 +1753,17 @@ void msm_dp_display_mode_set(struct msm_dp *dp, msm_dp_panel->msm_dp_mode.out_fmt_is_yuv_420 ? false : msm_dp_display->wide_bus_supported; } +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; + + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); + + msm_dp_display_mode_set_helper(msm_dp, mode, adjusted_mode, msm_dp_display->panel); +} + void msm_dp_bridge_hpd_enable(struct drm_bridge *bridge) { struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(bridge); diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 258c240de580b634c05cf5895a8e52160449eba1..2b23f2bf7535d3fd513d40a8411a1903fcd560b0 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -56,5 +56,13 @@ enum drm_mode_status msm_dp_display_mode_valid(struct msm_dp *dp, int msm_dp_display_set_stream_info(struct msm_dp *dp, struct msm_dp_panel *panel, u32 strm_id, u32 start_slot, u32 num_slots, u32 pbn, int vcpi); +void msm_dp_display_enable_helper(struct msm_dp *msm_dp, struct msm_dp_panel *msm_dp_panel); +void msm_dp_display_disable_helper(struct msm_dp *msm_dp, struct msm_dp_panel *msm_dp_panel); +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); +void msm_dp_display_atomic_post_disable_helper(struct msm_dp *msm_dp, + struct msm_dp_panel *msm_dp_panel); #endif /* _DP_DISPLAY_H_ */
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_abhinavk@quicinc.com> --- drivers/gpu/drm/msm/dp/dp_display.c | 96 ++++++++++++++++++++++++++----------- drivers/gpu/drm/msm/dp/dp_display.h | 8 ++++ 2 files changed, 75 insertions(+), 29 deletions(-)