From: Yongqiang Sun <yongqiang.sun@xxxxxxx>
Change-Id: Ifcf2bba5d0ac0200ae406e27407afdf237d13aa2
Signed-off-by: Yongqiang Sun <yongqiang.sun at amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng at amd.com>
Acked-by: Harry Wentland <Harry.Wentland at amd.com>
---
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index fb4eb4364bc7..ece8c96f3636 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -1689,19 +1689,21 @@ static void dcn10_apply_ctx_for_surface(
{
int i;
- memcpy(context->res_ctx.mpc_tree,
- dc->current_context->res_ctx.mpc_tree,
- sizeof(struct mpc_tree_cfg) * dc->res_pool->pipe_count);
-
for (i = 0; i < dc->res_pool->pipe_count; i++) {
struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
- if (!pipe_ctx->surface)
+ if (!pipe_ctx->surface || pipe_ctx->surface != surface)
continue;
+
/* looking for top pipe to program */
- if (!pipe_ctx->top_pipe)
+ if (!pipe_ctx->top_pipe) {
+ memcpy(context->res_ctx.mpc_tree,
+ dc->current_context->res_ctx.mpc_tree,
+ sizeof(struct mpc_tree_cfg) * dc->res_pool->pipe_count);
+
program_all_pipe_in_tree(dc, pipe_ctx, context);
+ }
}
for (i = 0; i < dc->res_pool->pipe_count; i++) {
--
2.11.0
