From 481505051cc8d6f114baf46197cb077fafe41083 Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 17 Apr 2023 05:17:20 +0000 Subject: [PATCH] drm/amd/display: Clear MST topology if it fails to resume From Roman Li 245525543f48cd9eabd2964d8931043e9e3c31cf in linux-6.1.y/6.1.24 3f6752b4de41896c7f1609b1585db2080e8150d8 in mainline linux --- sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 856aa52e74c..83013ee796e 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2177,6 +2177,8 @@ static int detect_mst_link_for_all_connectors(struct drm_device *dev) DRM_ERROR("DM_MST: Failed to start MST\n"); aconnector->dc_link->type = dc_connection_single; + ret = dm_helpers_dp_mst_stop_top_mgr(aconnector->dc_link->ctx, + aconnector->dc_link); break; } } -- 2.20.1