summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Yang <Eric.Yang2@amd.com>2018-06-12 18:37:12 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-26 08:39:40 +0200
commitb0442208f62f77b100b55f114f128f54e01dd07a (patch)
tree922ee4c4d11593e17728365292316607ddc5a30f
parent67a281a8bee9a368ba0a06211f11095c71093e0f (diff)
downloadlinux-stable-b0442208f62f77b100b55f114f128f54e01dd07a.tar.gz
linux-stable-b0442208f62f77b100b55f114f128f54e01dd07a.tar.bz2
linux-stable-b0442208f62f77b100b55f114f128f54e01dd07a.zip
drm/amd/display: support access ddc for mst branch
[ Upstream commit 0a14544661fad1606cc96aece30b2950fd9c4c81 ] [Why] Megachip dockings accesses ddc line through display driver when installing FW. Previously, we would fail every transaction because link attached to mst branch did not have their ddc transaction type set. [How] Set ddc transaction type when mst branch is connected. Signed-off-by: Eric Yang <Eric.Yang2@amd.com> Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> Acked-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 8a7890b03d97..6ccd59b87403 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -497,6 +497,10 @@ static bool detect_dp(
sink_caps->signal = SIGNAL_TYPE_DISPLAY_PORT_MST;
link->type = dc_connection_mst_branch;
+ dal_ddc_service_set_transaction_type(
+ link->ddc,
+ sink_caps->transaction_type);
+
/*
* This call will initiate MST topology discovery. Which
* will detect MST ports and add new DRM connector DRM