From: Aric Cyr Date: Sat, 18 Jan 2020 19:03:55 +0000 (-0500) Subject: drm/amd/display: Fix GSL acquire X-Git-Tag: v5.10.7~2823^2~26^2~173 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ba28b639d653d58e918eb854de26f0d01cc7d5b;p=platform%2Fkernel%2Flinux-rpi.git drm/amd/display: Fix GSL acquire [Why] After locking refactor GSL is not acquired properly resulting in immediate flip issues. [How] Do not copy old GSL state anymore since GSL is acquired earlier now. Signed-off-by: Aric Cyr Reviewed-by: Anthony Koo Acked-by: Bhawanpreet Lakha 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 129a91e..9713f45 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c @@ -1562,12 +1562,6 @@ void dcn20_program_front_end_for_ctx( } } - /* Carry over GSL groups in case the context is changing. */ - for (i = 0; i < dc->res_pool->pipe_count; i++) - if (context->res_ctx.pipe_ctx[i].stream == dc->current_state->res_ctx.pipe_ctx[i].stream) - context->res_ctx.pipe_ctx[i].stream_res.gsl_group = - dc->current_state->res_ctx.pipe_ctx[i].stream_res.gsl_group; - /* Set pipe update flags and lock pipes */ for (i = 0; i < dc->res_pool->pipe_count; i++) dcn20_detect_pipe_changes(&dc->current_state->res_ctx.pipe_ctx[i],