[PATCH] drm/amd/display: Add missing "Copy GSL groups when committing a new context"

[Kazlauskas, Nicholas]

On 2020-09-16 1:08 p.m., Bhawanpreet Lakha wrote:
> [Why]
> "Copy GSL groups when committing a new context" patch was accidentally
> removed during a refactor
> 
> Patch: 21ffcc94d5b ("drm/amd/display: Copy GSL groups when committing a new context")
> 
> [How]
> Re add it
> 
> Fixes: b6e881c9474 ("drm/amd/display: update navi to use new surface programming behaviour")
> Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha at amd.com>

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas at amd.com>

Regards,
Nicholas Kazlauskas

> ---
>   drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 11 +++++++++++
>   1 file changed, 11 insertions(+)
> 
> 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 5720b6e5d321..01530e686f43 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
> @@ -1642,6 +1642,17 @@ void dcn20_program_front_end_for_ctx(
>   	struct dce_hwseq *hws = dc->hwseq;
>   	DC_LOGGER_INIT(dc->ctx->logger);
>   
> +	/* Carry over GSL groups in case the context is changing. */
> +       for (i = 0; i < dc->res_pool->pipe_count; i++) {
> +               struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
> +               struct pipe_ctx *old_pipe_ctx =
> +                       &dc->current_state->res_ctx.pipe_ctx[i];
> +
> +               if (pipe_ctx->stream == old_pipe_ctx->stream)
> +                       pipe_ctx->stream_res.gsl_group =
> +                               old_pipe_ctx->stream_res.gsl_group;
> +       }
> +
>   	if (dc->hwss.program_triplebuffer != NULL && dc->debug.enable_tri_buf) {
>   		for (i = 0; i < dc->res_pool->pipe_count; i++) {
>   			struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
>