Skip to contentSkip to conversation

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

PATCH In review Alex Deucher 2 participants 2 messages Jan 24, 2022

Subsystems (3)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

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

This breaks HDMI audio.

This reverts commit 9413b23fadad3861f5afd626ac44ef83ad8068ab.

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +7 -1
index 6f6929435885..eb4432dca761 100644
@@ -5039,7 +5039,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:
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 2 lines · Alex Deucher

This breaks HDMI audio.

Do we have more info? This is DP code, but maybe the display is connected via a DP-HDMI adapter? Or via a n MST or USB-C hub?

As Siqueira mentioned, we couldn't reproduce the issue and the original change was intended to fix an issue with some receivers. Simply reverting it would likely reintroduce that bug.

Harry

Quoted 29 lines

This reverts commit 9413b23fadad3861f5afd626ac44ef83ad8068ab.

---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +7 -1
index 6f6929435885..eb4432dca761 100644
@@ -5039,7 +5039,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: