drm/amd/display: Toggle VSR button cause system crash
authorPeikang Zhang <peikang.zhang@amd.com>
Thu, 30 Jan 2020 15:49:46 +0000 (10:49 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 11 Feb 2020 16:50:12 +0000 (11:50 -0500)
[Why]
in dcn10_apply_ctx_for_surface(), if we hit !top_pipe_to_program,
pipe_ctx->update_flags could not get cleared.

[How]
Moved clearing pipe_ctx->update_flags logic before if
(!top_pipe_to_program) to gurantee pipe_ctx->update_flags get cleared.

Signed-off-by: Peikang Zhang <peikang.zhang@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

index 42fcfee2c31b72b69c8f09e5a430cdf73e51aeff..87e30f60cee6fb08a22820035ace615cf1f9f859 100644 (file)
@@ -2540,6 +2540,12 @@ void dcn10_apply_ctx_for_surface(
                        dcn10_find_top_pipe_for_stream(dc, context, stream);
        DC_LOGGER_INIT(dc->ctx->logger);
 
+       // Clear pipe_ctx flag
+       for (i = 0; i < dc->res_pool->pipe_count; i++) {
+               struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
+               pipe_ctx->update_flags.raw = 0;
+       }
+
        if (!top_pipe_to_program)
                return;
 
@@ -2570,8 +2576,6 @@ void dcn10_apply_ctx_for_surface(
                struct pipe_ctx *old_pipe_ctx =
                                &dc->current_state->res_ctx.pipe_ctx[i];
 
-               pipe_ctx->update_flags.raw = 0;
-
                if ((!pipe_ctx->plane_state ||
                     pipe_ctx->stream_res.tg != old_pipe_ctx->stream_res.tg) &&
                    old_pipe_ctx->plane_state &&