[PATCH 1/1][SRU][F/OEM-5.6] Revert "UBUNTU: SAUCE: drm/dp_mst: Retrieve extended DPCD caps for topology manager"
Koba Ko
koba.ko at canonical.com
Tue Nov 3 02:50:00 UTC 2020
BugLink: https://bugs.launchpad.net/bugs/1902613
This reverts commit d01f3bb0e480e8dbcf4c6405b737606797dd84dc.
Signed-off-by: Koba Ko <koba.ko at canonical.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index c273bd8d46de..8484b8d1688e 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -3517,9 +3517,9 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
WARN_ON(mgr->mst_primary);
/* get dpcd info */
- ret = drm_dp_read_dpcd_caps(mgr->aux, mgr->dpcd);
- if (ret < 0) {
- drm_dbg_kms(mgr->dev, "failed to read DPCD, ret %d\n", ret);
+ ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, mgr->dpcd, DP_RECEIVER_CAP_SIZE);
+ if (ret != DP_RECEIVER_CAP_SIZE) {
+ DRM_DEBUG_KMS("failed to read DPCD\n");
goto out_unlock;
}
--
2.17.1
More information about the kernel-team
mailing list