From: jsg <jsg@openbsd.org>
Date: Mon, 19 Jul 2021 10:15:04 +0000 (+0000)
Subject: drm/amd/display: Release MST resources on switch from MST to SST
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6cc0ae3d9669786d956cf7f1e118241c9e46471d;p=openbsd

drm/amd/display: Release MST resources on switch from MST to SST

From Vladimir Stempen
02f444321b3a0f3f94e34329f8aafa814c45b8e4 in linux 5.10.y/5.10.51
3f8518b60c10aa96f3efa38a967a0b4eb9211ac0 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c b/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c
index 2d86ffd6a2e..8c3bb9fdf5f 100644
--- a/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c
+++ b/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c
@@ -1704,6 +1704,8 @@ static void set_dp_mst_mode(struct dc_link *link, bool mst_enable)
 		link->type = dc_connection_single;
 		link->local_sink = link->remote_sinks[0];
 		link->local_sink->sink_signal = SIGNAL_TYPE_DISPLAY_PORT;
+		dc_sink_retain(link->local_sink);
+		dm_helpers_dp_mst_stop_top_mgr(link->ctx, link);
 	} else if (mst_enable == true &&
 			link->type == dc_connection_single &&
 			link->remote_sinks[0] != NULL) {