drm/amd/display: Only apply ctx for specific surface.

Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 fb4eb4364bc731f01c37d7ba57f2d9cb01347ba9..ece8c96f3636ef2e3c4a56886655a0d48d21c518 100644 (file)
--- 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++) {