On Mon, Aug 25, 2025 at 10:16:21PM +0800, Yongxing Mou wrote:
> From: Abhinav Kumar <quic_abhin...@quicinc.com>
>
> For each MST capable DP controller, initialize a dp_mst module to
> manage its DP MST operations. The DP MST module for each controller
> is the central entity to manage its topology related operations as
> well as interfacing with the rest of the DP driver.
>
> Signed-off-by: Abhinav Kumar <quic_abhin...@quicinc.com>
> Signed-off-by: Yongxing Mou <yongxing....@oss.qualcomm.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 ++++++
> drivers/gpu/drm/msm/dp/dp_display.c | 9 +++++++++
> drivers/gpu/drm/msm/msm_drv.h | 6 ++++++
> 3 files changed, 21 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> index
> 0b9d9207f4f69e0d0725ff265c624828b5816a8b..4036d3445946930e635401109ac4720ed2282c2f
> 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> @@ -681,6 +681,12 @@ static int _dpu_kms_initialize_displayport(struct
> drm_device *dev,
> stream_cnt = msm_dp_get_mst_max_stream(priv->kms->dp[i]);
>
> if (stream_cnt > 1) {
> + rc = msm_dp_mst_register(priv->kms->dp[i]);
> + if (rc) {
> + DPU_ERROR("dp_mst_init failed for DP, rc =
> %d\n", rc);
> + return rc;
> + }
> +
> for (stream_id = 0; stream_id < stream_cnt;
> stream_id++) {
> info.stream_id = stream_id;
> encoder = dpu_encoder_init(dev,
> DRM_MODE_ENCODER_DPMST, &info);
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index
> 909c84a5c97f56138d0d62c5d856d2fd18d36b8c..897ef653b3cea08904bb3595e8ac10fd7fcf811f
> 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -1586,6 +1586,15 @@ int msm_dp_modeset_init(struct msm_dp *msm_dp_display,
> struct drm_device *dev,
> return 0;
> }
>
> +inline int msm_dp_mst_register(struct msm_dp *msm_dp_display)
Why is it inline? Also please move this to a corresponding patch (the
one which adds msm_dp_mst_init).
> +{
> + struct msm_dp_display_private *dp;
> +
> + dp = container_of(msm_dp_display, struct msm_dp_display_private,
> msm_dp_display);
> +
> + return msm_dp_mst_init(msm_dp_display, dp->max_stream, dp->aux);
> +}
> +
> void msm_dp_display_atomic_prepare(struct msm_dp *msm_dp_display)
> {
> int rc = 0;
> diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
> index
> 3e64ec7b7dbe1d1107e85def9aa80277131f40bf..c46c88cf06598df996a17c23631570fda078b371
> 100644
> --- a/drivers/gpu/drm/msm/msm_drv.h
> +++ b/drivers/gpu/drm/msm/msm_drv.h
> @@ -365,6 +365,7 @@ bool msm_dp_wide_bus_available(const struct msm_dp
> *dp_display);
>
> int msm_dp_get_mst_max_stream(struct msm_dp *dp_display);
> int msm_dp_mst_drm_bridge_init(struct msm_dp *dp_display, struct drm_encoder
> *encoder);
> +int msm_dp_mst_register(struct msm_dp *dp_display);
>
> #else
> static inline int __init msm_dp_register(void)
> @@ -392,6 +393,11 @@ static inline int msm_dp_mst_drm_bridge_init(struct
> msm_dp *dp_display, struct d
> return -EINVAL;
> }
>
> +static inline int msm_dp_mst_register(struct msm_dp *dp_display)
> +{
> + return -EINVAL;
> +}
> +
> static inline void msm_dp_snapshot(struct msm_disp_state *disp_state, struct
> msm_dp *dp_display)
> {
> }
>
> --
> 2.34.1
>
--
With best wishes
Dmitry
