diff mbox series

[1/1,SRU,F/OEM-5.6] Revert "UBUNTU: SAUCE: drm/dp_mst: Retrieve extended DPCD caps for topology manager"

Message ID 20201103025000.68006-2-koba.ko@canonical.com
State New
Headers show
Series drm/i915/dp_mst - only read the base capability in DPCD. | expand

Commit Message

Koba Ko Nov. 3, 2020, 2:50 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1902613                                 

This reverts commit d01f3bb0e480e8dbcf4c6405b737606797dd84dc.

Signed-off-by: Koba Ko <koba.ko@canonical.com>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

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;
 		}