The DPU and MDP5 backends query whether a DSI link runs in command mode by calling msm_dsi_is_cmd_mode() directly on the concrete sub-block while building their encoders.
Add a mandatory is_cmd_mode() callback to struct msm_display_funcs; DSI implements it, DP and HDMI (always video) return false. The backends dispatch through the callback. No functional change intended. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Dmitry Baryshkov <[email protected]> --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 +++- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 4 +++- drivers/gpu/drm/msm/dp/dp_display.c | 6 ++++++ drivers/gpu/drm/msm/dsi/dsi.c | 4 +++- drivers/gpu/drm/msm/hdmi/hdmi.c | 6 ++++++ drivers/gpu/drm/msm/msm_drv.h | 7 ++----- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 42dff1a98292..7928bc1a73f3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -583,6 +583,7 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, { struct drm_encoder *encoder = NULL; struct msm_display_info info; + struct msm_display *display; int i, rc = 0; if (!(priv->kms->dsi[0] || priv->kms->dsi[1])) @@ -613,7 +614,8 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, if (msm_dsi_is_bonded_dsi(priv->kms->dsi[i])) info.h_tile_instance[info.num_of_h_tiles++] = other; - info.is_cmd_mode = msm_dsi_is_cmd_mode(priv->kms->dsi[i]); + display = msm_dsi_get_display(priv->kms->dsi[i]); + info.is_cmd_mode = display->funcs->is_cmd_mode(display); rc = dpu_kms_dsi_set_te_source(&info, priv->kms->dsi[i]); if (rc) { diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 68b71a7c6666..e372d295b80f 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -337,6 +337,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, const struct mdp5_cfg_hw *hw_cfg = mdp5_cfg_get_hw_config(mdp5_kms->cfg); int dsi_id = get_dsi_id_from_intf(hw_cfg, intf->num); + struct msm_display *display; if ((dsi_id >= ARRAY_SIZE(priv->kms->dsi)) || (dsi_id < 0)) { DRM_DEV_ERROR(dev->dev, "failed to find dsi from intf %d\n", @@ -360,9 +361,10 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, break; } + display = msm_dsi_get_display(priv->kms->dsi[dsi_id]); priv->kms->dsi_encoder[dsi_id] = encoder; mdp5_encoder_set_intf_mode(encoder, - msm_dsi_is_cmd_mode(priv->kms->dsi[dsi_id])); + display->funcs->is_cmd_mode(display)); break; } diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 773dee9d0be4..425526db7ef9 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1369,11 +1369,17 @@ static bool msm_dp_display_needs_periph_flush(struct msm_display *display, return msm_dp_needs_periph_flush(dp, mode); } +static bool msm_dp_display_is_cmd_mode(struct msm_display *display) +{ + return false; +} + static const struct msm_display_funcs msm_dp_display_funcs = { .modeset_init = msm_dp_modeset_init, .snapshot = msm_dp_snapshot, .wide_bus_enabled = msm_dp_display_wide_bus_enabled, .needs_periph_flush = msm_dp_display_needs_periph_flush, + .is_cmd_mode = msm_dp_display_is_cmd_mode, }; struct msm_display *msm_dp_get_display(struct msm_dp *msm_dp_display) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 085e202bf7e6..bda778dbcc5b 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -5,8 +5,9 @@ #include "dsi.h" -bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi) +static bool msm_dsi_is_cmd_mode(struct msm_display *display) { + struct msm_dsi *msm_dsi = container_of(display, struct msm_dsi, display); unsigned long host_flags = msm_dsi_host_get_mode_flags(msm_dsi->host); return !(host_flags & MIPI_DSI_MODE_VIDEO); @@ -289,6 +290,7 @@ static const struct msm_display_funcs msm_dsi_display_funcs = { .snapshot = msm_dsi_snapshot, .wide_bus_enabled = msm_dsi_wide_bus_enabled, .needs_periph_flush = msm_dsi_needs_periph_flush, + .is_cmd_mode = msm_dsi_is_cmd_mode, }; struct msm_display *msm_dsi_get_display(struct msm_dsi *msm_dsi) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 72f7403265f9..828cb89ebf9a 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -239,11 +239,17 @@ static bool msm_hdmi_needs_periph_flush(struct msm_display *display, return false; } +static bool msm_hdmi_is_cmd_mode(struct msm_display *display) +{ + return false; +} + static const struct msm_display_funcs msm_hdmi_display_funcs = { .modeset_init = msm_hdmi_modeset_init, .snapshot = msm_hdmi_snapshot, .wide_bus_enabled = msm_hdmi_wide_bus_enabled, .needs_periph_flush = msm_hdmi_needs_periph_flush, + .is_cmd_mode = msm_hdmi_is_cmd_mode, }; struct msm_display *msm_hdmi_get_display(struct hdmi *hdmi) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 806d72ed393b..5320e4977af9 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -286,6 +286,7 @@ struct msm_disp_state; * @wide_bus_enabled: whether the sub-block drives a wide (2 pixel/clock) bus; * mandatory. * @needs_periph_flush: whether @mode requires a peripheral flush; mandatory. + * @is_cmd_mode: whether the sub-block runs in command mode; mandatory. */ struct msm_display_funcs { int (*modeset_init)(struct msm_display *display, struct drm_device *dev, @@ -295,6 +296,7 @@ struct msm_display_funcs { bool (*wide_bus_enabled)(struct msm_display *display); bool (*needs_periph_flush)(struct msm_display *display, const struct drm_display_mode *mode); + bool (*is_cmd_mode)(struct msm_display *display); }; /** @@ -330,7 +332,6 @@ void dsi_dev_detach(struct platform_device *pdev); void __init msm_dsi_register(void); void __exit msm_dsi_unregister(void); struct msm_display *msm_dsi_get_display(struct msm_dsi *msm_dsi); -bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi); bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi); bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi); struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi); @@ -346,10 +347,6 @@ static inline struct msm_display *msm_dsi_get_display(struct msm_dsi *msm_dsi) { return NULL; } -static inline bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi) -{ - return false; -} static inline bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi) { return false; -- 2.47.3
