Commit 7ba99b43 authored by Peikang Zhang's avatar Peikang Zhang Committed by Alex Deucher

drm/amd/display: Toggle VSR button cause system crash

[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: default avatarPeikang Zhang <peikang.zhang@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 94562810
...@@ -2540,6 +2540,12 @@ void dcn10_apply_ctx_for_surface( ...@@ -2540,6 +2540,12 @@ void dcn10_apply_ctx_for_surface(
dcn10_find_top_pipe_for_stream(dc, context, stream); dcn10_find_top_pipe_for_stream(dc, context, stream);
DC_LOGGER_INIT(dc->ctx->logger); 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) if (!top_pipe_to_program)
return; return;
...@@ -2570,8 +2576,6 @@ void dcn10_apply_ctx_for_surface( ...@@ -2570,8 +2576,6 @@ void dcn10_apply_ctx_for_surface(
struct pipe_ctx *old_pipe_ctx = struct pipe_ctx *old_pipe_ctx =
&dc->current_state->res_ctx.pipe_ctx[i]; &dc->current_state->res_ctx.pipe_ctx[i];
pipe_ctx->update_flags.raw = 0;
if ((!pipe_ctx->plane_state || if ((!pipe_ctx->plane_state ||
pipe_ctx->stream_res.tg != old_pipe_ctx->stream_res.tg) && pipe_ctx->stream_res.tg != old_pipe_ctx->stream_res.tg) &&
old_pipe_ctx->plane_state && old_pipe_ctx->plane_state &&
......
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