Skip to content

Commit 6a03581

Browse files
Roman Ligregkh
authored andcommitted
drm/amd/display: Fix allocate_mst_payload assert on resume
[ Upstream commit f4346fb ] [Why] On resume we do link detection for all non-MST connectors. MST is handled separately. However the condition for telling if connector is on mst branch is not enough for mst hub case. Link detection for mst branch link leads to mst topology reset. That causes assert in dc_link_allocate_mst_payload() [How] Use link type as indicator for mst link. Reviewed-by: Wayne Lin <Wayne.Lin@amd.com> Acked-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Roman Li <Roman.Li@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent ac2eb31 commit 6a03581

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2296,7 +2296,8 @@ static int dm_resume(void *handle)
22962296
* this is the case when traversing through already created
22972297
* MST connectors, should be skipped
22982298
*/
2299-
if (aconnector->mst_port)
2299+
if (aconnector->dc_link &&
2300+
aconnector->dc_link->type == dc_connection_mst_branch)
23002301
continue;
23012302

23022303
mutex_lock(&aconnector->hpd_lock);

0 commit comments

Comments
 (0)