Thank you for your contribution! Sashiko AI review found 5 potential
issues to consider:
- [High] drm/msm/dp: missing msm_dp_display_unprepare() on MST unplug
- [High] drm/msm/dp: msm_dp_bridge_detect() sets plugged=true and blocks
  MST enablement
- [Medium] drm/msm/dp: unchecked set_mgr_state error in
  msm_dp_display_mst_enable()
- [Medium] drm/msm/dp: msm_dp_display_mode_valid() ignores info for
  dp->connector
- [Medium] drm/msm/dp: race on mst_active and plugged in
  msm_dp_bridge_detect()
--

commit cd4f05789938aa44aebbfa953a74a28b9b779975
Author: Abhinav Kumar <[email protected]>

drm/msm/dp: enable MST on capable sinks

This commit enables MST mode on MST-capable sinks connected to
multi-stream DP controllers and updates the MST topology manager state on
HPD plug and unplug.

> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c 
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index 17487a7900d00..7f5247cbae035 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
[ ... ]
> @@ -270,10 +271,34 @@ static int msm_dp_display_lttpr_init(struct 
> msm_dp_display_private *dp, u8 *dpcd
>       return lttpr_count;
>  }
>  
> +static void msm_dp_display_mst_enable(struct msm_dp_display_private *dp)
> +{
> +     struct msm_dp *msm_dp = &dp->msm_dp_display;
> +     int ret;
> +
> +     /* Clear any pre-existing MST state before enabling MST. */
> +     ret = drm_dp_dpcd_write_byte(dp->aux, DP_MSTM_CTRL, 0);
> +     if (ret < 0) {
> +             DRM_ERROR("failed to clear DP_MSTM_CTRL, ret=%d\n", ret);
> +             return;
> +     }
> +
> +     ret = drm_dp_dpcd_write_byte(dp->aux, DP_MSTM_CTRL,
> +                                  DP_MST_EN | DP_UP_REQ_EN | 
> DP_UPSTREAM_IS_SRC);
> +     if (ret < 0) {
> +             DRM_ERROR("sink MST enablement failed\n");
> +             return;
> +     }
> +
> +     msm_dp->mst_active = true;
> +     msm_dp_mst_display_set_mgr_state(msm_dp, true);
> +}

[Severity: Medium]
Does ignoring the return value of msm_dp_mst_display_set_mgr_state() leave
msm_dp->mst_active set to true when drm_dp_mst_topology_mgr_set_mst()
fails?

If drm_dp_read_dpcd_caps(), drm_dp_add_mst_branch_device(), or the DPCD
write fails inside drm_dp_mst_topology_mgr_set_mst(), topology discovery is
not started, but mst_active remains true.  msm_dp_bridge_detect() then
reports the SST connector as disconnected while no MST connectors can be
probed, and msm_dp_irq_hpd_handle() routes HPD IRQs to an uninitialized
topology manager.

Also, can msm_dp_bridge_detect() race with msm_dp_hpd_plug_handle() on
dp->mst_active?

drivers/gpu/drm/msm/dp/dp_display.c:msm_dp_bridge_detect() {
        if (dp->mst_active)
                return status;

        guard(mutex)(&priv->plugged_lock);
}

CPU0                                    CPU1
msm_dp_hpd_plug_handle()
  mutex_lock(&dp->plugged_lock)
  msm_dp_display_process_hpd_high()
                                        msm_dp_bridge_detect()
                                          if (dp->mst_active) /* false */
                                          mutex_lock(&priv->plugged_lock)
    msm_dp_display_mst_enable()
      msm_dp->mst_active = true
  dp->plugged = true
  mutex_unlock(&dp->plugged_lock)
                                          pm_runtime_resume_and_get(...)
                                            <-- proceeds while MST active

Because msm_dp_bridge_detect() does not recheck dp->mst_active after
acquiring priv->plugged_lock, it performs SST DPCD reads concurrently with
the active MST topology manager and leaks the runtime PM reference at end:
because priv->plugged is true.

>  static int msm_dp_display_process_hpd_high(struct msm_dp_display_private *dp)
>  {
>       struct drm_connector *connector = dp->msm_dp_display.connector;
>       const struct drm_display_info *info = &connector->display_info;
> +     enum drm_dp_mst_mode mst_mode = DRM_DP_SST;
>       int rc = 0;
>       u8 dpcd[DP_RECEIVER_CAP_SIZE];
>       const struct drm_edid *drm_edid = NULL;
> @@ -288,14 +313,19 @@ static int msm_dp_display_process_hpd_high(struct 
> msm_dp_display_private *dp)
>       if (rc)
>               goto end;
>  
> -     drm_edid = drm_edid_read_ddc(connector, &dp->aux->ddc);
> -     drm_edid_connector_update(connector, drm_edid);
> +     if (msm_dp_ctrl_get_stream_cnt(dp->ctrl) > 1)
> +             mst_mode = drm_dp_read_mst_cap(dp->aux, dp->panel->dpcd);
>  
> -     if (!drm_edid) {
> -             DRM_ERROR("panel edid read failed\n");
> -             /* check edid read fail is due to unplug */
> -             if (!msm_dp_aux_is_link_connected(dp->aux))
> -                     return -ETIMEDOUT;
> +     if (mst_mode != DRM_DP_MST) {
> +             drm_edid = drm_edid_read_ddc(connector, &dp->aux->ddc);
> +             drm_edid_connector_update(connector, drm_edid);
> +
> +             if (!drm_edid) {
> +                     DRM_ERROR("panel edid read failed\n");
> +                     /* check edid read fail is due to unplug */
> +                     if (!msm_dp_aux_is_link_connected(dp->aux))
> +                             return -ETIMEDOUT;
> +             }
>       }

[Severity: Medium]
With EDID updates skipped on the primary connector in MST mode, does
msm_dp_display_mode_valid() check an unpopulated display_info when called
from msm_dp_mst_connector_mode_valid()?

msm_dp_mst_connector_mode_valid() passes the MST port connector's
&connector->display_info as info, but msm_dp_display_mode_valid() ignores
info and reads &dp->connector->display_info:

drivers/gpu/drm/msm/dp/dp_display.c:msm_dp_display_mode_valid() {
        ...
        is_yuv_420 = drm_mode_is_420_only(&dp->connector->display_info, mode);
        ...
        mode_bpp = dp->connector->display_info.bpc * num_components;
}

As a result, is_yuv_420 is always false and bpc is always 0 for MST
connectors, so YUV420-only modes are validated at twice their actual pixel
clock and link rate.  Similarly, msm_dp_needs_periph_flush() checks
&msm_dp_display->connector->display_info, so the peripheral flush bit for
VSC SDP packets is not set for MST YUV420 streams.

>       msm_dp_link_process_request(dp->link);
> @@ -317,6 +347,9 @@ static int msm_dp_display_process_hpd_high(struct 
> msm_dp_display_private *dp)
>        */
>       msm_dp_link_psm_config(dp->link, &dp->link->link_caps, false);
>  
> +     if (mst_mode == DRM_DP_MST)
> +             msm_dp_display_mst_enable(dp);

[Severity: High]
Can msm_dp_bridge_detect() prevent msm_dp_display_mst_enable() from ever
running when an MST sink is connected at boot?

During initial connector probing, msm_dp_bridge_detect() runs while
dp->mst_active is still false and sets priv->plugged = true:

drivers/gpu/drm/msm/dp/dp_display.c:msm_dp_bridge_detect() {
        ...
        status = connector_status_connected;
        priv->plugged = true;
}

When msm_dp_hpd_plug_handle() subsequently runs, it sees dp->plugged ==
true and returns early without calling msm_dp_display_process_hpd_high(),
leaving link_caps uninitialized and MST disabled until the cable is
physically replugged.

>       msm_dp_link_reset_phy_params_vx_px(dp->link);
>  
>  end:
> @@ -502,6 +535,11 @@ static int msm_dp_hpd_unplug_handle(struct 
> msm_dp_display_private *dp)
>                                                dp->panel->dpcd,
>                                                dp->panel->downstream_ports);
>  
> +     if (dp->msm_dp_display.mst_active) {
> +             msm_dp_mst_display_set_mgr_state(&dp->msm_dp_display, false);
> +             dp->msm_dp_display.mst_active = false;
> +     }

[Severity: High]
Does unplugging an MST sink skip msm_dp_display_unprepare() and leave
msm_dp_display->link_ready stuck at true?

When MST streams are disabled while mst_active is true (such as on DPMS
off, when downstream monitors are unplugged from an MST hub first, or
before msm_dp_hpd_unplug_handle() clears mst_active),
msm_dp_mst_stream_post_disable() skips msm_dp_display_unprepare():

drivers/gpu/drm/msm/dp/dp_mst_drm.c:msm_dp_mst_stream_post_disable() {
        ...
        msm_dp_display_atomic_post_disable_helper(mst->msm_dp, panel);

        if (!mst->msm_dp->mst_active)
                msm_dp_display_unprepare(mst->msm_dp);
}

Because msm_dp_hpd_unplug_handle() clears mst_active without calling
msm_dp_display_unprepare(), the runtime PM reference and link clocks from
msm_dp_display_prepare_link() are leaked, and link_ready remains true so
subsequent hotplug connections return early from
msm_dp_display_prepare_link() without initializing the PHY or training the
link.

-- 
Sashiko AI review ยท 
https://sashiko.dev/#/patchset/[email protected]?part=24

Reply via email to