]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
drm/amd/display: Enable mst when it's detected but yet to be initialized
authorWayne Lin <Wayne.Lin@amd.com>
Wed, 5 Nov 2025 02:36:31 +0000 (10:36 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 6 Nov 2025 16:58:55 +0000 (11:58 -0500)
commit3c6a743c6961cc2cab453b343bb157d6bbbf8120
tree6a30034f42a295ea0645dde3e03829399a0e702a
parent570a66b48c22214851949fcd71816fee280aa096
drm/amd/display: Enable mst when it's detected but yet to be initialized

[Why]
drm_dp_mst_topology_queue_probe() is used under the assumption that
mst is already initialized. If we connect system with SST first
then switch to the mst branch during suspend, we will fail probing
topology by calling the wrong API since the mst manager is yet to
be initialized.

[How]
At dm_resume(), once it's detected as mst branc connected, check if
the mst is initialized already. If not, call
dm_helpers_dp_mst_start_top_mgr() instead to initialize mst

V2: Adjust the commit msg a bit

Fixes: bc068194f548 ("drm/amd/display: Don't write DP_MSTM_CTRL after LT")
Cc: Fangzhi Zuo <jerry.zuo@amd.com>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Wayne Lin <Wayne.Lin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 62320fb8d91a0bddc44a228203cfa9bfbb5395bd)
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c