On Mon, Jun 09, 2025 at 08:21:53PM +0800, Yongxing Mou wrote: > From: Abhinav Kumar <[email protected]> > > 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.
I think there is an ordering issue. Previos patch has already registered MST-related objects, but only this patch provides a way to init it. > > Signed-off-by: Abhinav Kumar <[email protected]> > Signed-off-by: Yongxing Mou <[email protected]> > --- > 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 > 45fedf7e74e9c6dfed4bde57eb675e3dd1762fc7..e030476dc4c69448886c29bcfe8ff3105949b129 > 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -680,6 +680,12 @@ static int _dpu_kms_initialize_displayport(struct > drm_device *dev, > stream_cnt = msm_dp_get_mst_max_stream(priv->dp[i]); > > if (stream_cnt > 1) { > + rc = msm_dp_mst_register(priv->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 > ab1ad0cb6427eb4f86ee8ac6c76788b1a78892a8..526389c718edccbac9b5a91e8dabf0d84ed1a8b0 > 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -1667,6 +1667,15 @@ int msm_dp_modeset_init(struct msm_dp *msm_dp_display, > struct drm_device *dev, > return 0; > } > > +int msm_dp_mst_register(struct msm_dp *dp) > +{ > + struct msm_dp_display_private *dp_display; > + > + dp_display = container_of(dp, struct msm_dp_display_private, > msm_dp_display); > + > + return msm_dp_mst_init(dp, dp_display->max_stream, dp_display->aux); Inline > +} > + > void msm_dp_display_atomic_prepare(struct msm_dp *dp) > { > int rc = 0; > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index > dd403107b640ee5ef333d2773b52e38e3869155f..1496700c38ad73d6edcf56fbb0ebf66505c608bf > 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -374,6 +374,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_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) > @@ -401,6 +402,11 @@ static inline int msm_dp_mst_bridge_init(struct msm_dp > *dp_display, struct drm_e > 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
