From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 24 Mar 2021 01:19:55 +0000 (-0400)
Subject: Revert "drm/amd/display: To modify the condition in indicating branch device"
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=07dedc2a22e321d98da961f5f2efdc0e8ef455d5;p=users%2Fjedix%2Flinux-maple.git

Revert "drm/amd/display: To modify the condition in indicating branch device"

This breaks HDMI audio.

This reverts commit 9413b23fadad3861f5afd626ac44ef83ad8068ab.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1536
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Martin Tsai <martin.tsai@amd.com>
Cc: Bindu Ramamurthy <bindu.r@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 3ff3d9e909837..9024a855b7068 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -3276,7 +3276,13 @@ static void get_active_converter_info(
 	}
 
 	/* DPCD 0x5 bit 0 = 1, it indicate it's branch device */
-	link->dpcd_caps.is_branch_dev = ds_port.fields.PORT_PRESENT;
+	if (ds_port.fields.PORT_TYPE == DOWNSTREAM_DP) {
+		link->dpcd_caps.is_branch_dev = false;
+	}
+
+	else {
+		link->dpcd_caps.is_branch_dev = ds_port.fields.PORT_PRESENT;
+	}
 
 	switch (ds_port.fields.PORT_TYPE) {
 	case DOWNSTREAM_VGA: