summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2023-04-17 05:17:21 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2023-04-17 05:17:21 +0000
commit08bd32eb571c17a361293c25671d40a1b2ddc055 (patch)
tree39c16fa8aa01c29831a9d916b46eca55990d22f0
parenta3cc14d1ff8c483ff48d8eb834f142e69fa78788 (diff)
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
-rw-r--r--sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c2
1 files changed, 2 insertions, 0 deletions
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;
}
}