From: Yongqiang Sun <yongqiang.sun@xxxxxxx> Change-Id: I30658257832be3865f3f3af0b471fd490fab4426 Signed-off-by: Yongqiang Sun <yongqiang.sun at amd.com> Acked-by: Harry Wentland <Harry.Wentland at amd.com> Reviewed-by: Tony Cheng <Tony.Cheng at amd.com> --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index f1b1dae5399e..c38f71e45381 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1134,6 +1134,9 @@ enum dc_status resource_map_pool_resources( if (!are_stream_backends_same(old_pipe_ctx->stream, stream)) continue; + if (old_pipe_ctx->top_pipe) + continue; + pipe_ctx->stream = stream; copy_pipe_ctx(old_pipe_ctx, pipe_ctx); -- 2.10.2
