drm/dp_mst: Fix GUID DPCD write to non-root MST branch devices
authorImre Deak <imre.deak@intel.com>
Tue, 1 Apr 2025 10:38:45 +0000 (13:38 +0300)
committerImre Deak <imre.deak@intel.com>
Thu, 3 Apr 2025 14:03:01 +0000 (17:03 +0300)
The return value on success of drm_dp_send_dpcd_write() called for
non-root MST branch devices from drm_dp_check_mstb_guid() is the number
of bytes transferred. Atm this return value (in case of a complete read)
will be regarded incorrectly as an error by the caller of
drm_dp_check_mstb_guid(). Fix this by converting the return value for a
complete read to the expected success code (0) and for a partial read to
a failure code (-EPROTO).

Fixes: 2554da0de3e8 ("drm/display: dp-mst-topology: use new DCPD access helpers")
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Lyude Paul <lyude@redhat.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/20250401103846.686408-1-imre.deak@intel.com
drivers/gpu/drm/display/drm_dp_mst_topology.c

index e8716e73480bdf6abbef71897d1632f69a7b8a47..8c312c1f172438d7c9110de655a52ac3a63ffc24 100644 (file)
@@ -2200,6 +2200,8 @@ static int drm_dp_check_mstb_guid(struct drm_dp_mst_branch *mstb, guid_t *guid)
                        ret = drm_dp_send_dpcd_write(mstb->mgr,
                                                     mstb->port_parent,
                                                     DP_GUID, sizeof(buf), buf);
+                       if (ret >= 0)
+                               ret = ret == sizeof(buf) ? 0 : -EPROTO;
                } else {
                        ret = drm_dp_dpcd_write_data(mstb->mgr->aux,
                                                     DP_GUID, buf, sizeof(buf));