From: jsg <jsg@openbsd.org>
Date: Thu, 21 Apr 2022 09:53:32 +0000 (+0000)
Subject: drm/amd/display: Fix allocate_mst_payload assert on resume
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3bc92c5a5eaca31186d636cd298aa8600eb59d50;p=openbsd

drm/amd/display: Fix allocate_mst_payload assert on resume

From Roman Li
6a03581ccffa571bfa1a9f3a097e1a4d7164fd2d in linux 5.15.y/5.15.35
f4346fb3edf7720db3f7f5e1cab1f667cd024280 in mainline linux
---

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 6d365997afe..01b189e114e 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
@@ -2298,7 +2298,8 @@ static int dm_resume(void *handle)
 		 * this is the case when traversing through already created
 		 * MST connectors, should be skipped
 		 */
-		if (aconnector->mst_port)
+		if (aconnector->dc_link &&
+		    aconnector->dc_link->type == dc_connection_mst_branch)
 			continue;
 
 		mutex_lock(&aconnector->hpd_lock);