Commit 482e6ad9 authored by Fangzhi Zuo's avatar Fangzhi Zuo Committed by Alex Deucher

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: default avatarWayne Lin <wayne.lin@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarFangzhi Zuo <jerry.zuo@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 137f9cee
...@@ -2857,7 +2857,7 @@ static int dm_resume(void *handle) ...@@ -2857,7 +2857,7 @@ static int dm_resume(void *handle)
* this is the case when traversing through already created * this is the case when traversing through already created
* MST connectors, should be skipped * MST connectors, should be skipped
*/ */
if (aconnector->dc_link->type == dc_connection_mst_branch) if (aconnector && aconnector->mst_root)
continue; continue;
mutex_lock(&aconnector->hpd_lock); mutex_lock(&aconnector->hpd_lock);
...@@ -6742,7 +6742,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, ...@@ -6742,7 +6742,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
int clock, bpp = 0; int clock, bpp = 0;
bool is_y420 = false; bool is_y420 = false;
if (!aconnector->mst_output_port || !aconnector->dc_sink) if (!aconnector->mst_output_port)
return 0; return 0;
mst_port = aconnector->mst_output_port; mst_port = aconnector->mst_output_port;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment