Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/display: Have Payload Properly Created After Resume

At drm suspend sequence, MST dc_sink is removed. When commit cached
MST stream back in drm resume sequence, the MST stream payload is not
properly created and added into the payload table. After resume, topology
change is reprobed by removing existing streams first. That leads to
no payload is found in the existing payload table as below error
"[drm] ERROR No payload for [MST PORT:] found in mst state"

1. In encoder .atomic_check routine, remove check existance of dc_sink
2. Bypass MST by checking existence of MST root port. dc_link_type cannot
differentiate MST port before topology is rediscovered.

Reviewed-by: Wayne Lin <wayne.lin@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Fangzhi Zuo and committed by
Alex Deucher
91b38ca1 0ab720d5

+2 -2
+2 -2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 2853 2853 * this is the case when traversing through already created 2854 2854 * MST connectors, should be skipped 2855 2855 */ 2856 - if (aconnector->dc_link->type == dc_connection_mst_branch) 2856 + if (aconnector && aconnector->mst_root) 2857 2857 continue; 2858 2858 2859 2859 mutex_lock(&aconnector->hpd_lock); ··· 6776 6776 int clock, bpp = 0; 6777 6777 bool is_y420 = false; 6778 6778 6779 - if (!aconnector->mst_output_port || !aconnector->dc_sink) 6779 + if (!aconnector->mst_output_port) 6780 6780 return 0; 6781 6781 6782 6782 mst_port = aconnector->mst_output_port;