From: Alvin Lee Date: Wed, 21 Oct 2020 15:59:47 +0000 (-0400) Subject: drm/amd/display: Reset flip_immediate to topmost plane X-Git-Tag: io_uring-5.11-2020-12-23~116^2~12^2~52 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ec76bd6f07d0f84eed64b5491e7103e6b2b79860;p=linux-2.6-block.git drm/amd/display: Reset flip_immediate to topmost plane [Why] When checking if we want to disable GSL or not, we should reset flip_immediate to be the flip type of the topmost plane before looping through the other planes. [How] Set flip_immediate to be the flip type of the topmost plane before looping through the other planes. Signed-off-by: Alvin Lee Reviewed-by: Aric Cyr Acked-by: Qingqing Zhuo Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c index 3b26396cbc5c..a195dfb718dd 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c @@ -1204,6 +1204,9 @@ void dcn20_pipe_control_lock( (!flip_immediate && pipe->stream_res.gsl_group > 0)) dcn20_setup_gsl_group_as_lock(dc, pipe, flip_immediate); + if (pipe->plane_state != NULL) + flip_immediate = pipe->plane_state->flip_immediate; + temp_pipe = pipe->bottom_pipe; while (flip_immediate && temp_pipe) { if (temp_pipe->plane_state != NULL)