From: Yongqiang Sun <yongqiang.sun@amd.com>
Date: Mon, 23 Jan 2017 17:10:04 -0500
Subject: drm/amd/display: Fixed 4K black issue by refactor update surface.
Git-commit: ed1519403227490d517c2d59755d68d3c31afa12
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
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>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 32 +++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1482,17 +1482,19 @@ void dc_update_surfaces_for_stream(struc
}
/* not sure if we still need this */
- for (j = 0; j < context->res_ctx.pool->pipe_count; j++) {
- struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
- struct core_stream *stream = pipe_ctx->stream;
-
- if (pipe_ctx->surface != surface)
- continue;
-
- resource_build_scaling_params(updates[i].surface, pipe_ctx);
- if (dc->debug.surface_visual_confirm) {
- pipe_ctx->scl_data.recout.height -= 2;
- pipe_ctx->scl_data.recout.width -= 2;
+ if (update_type == UPDATE_TYPE_FULL) {
+ for (j = 0; j < context->res_ctx.pool->pipe_count; j++) {
+ struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
+ struct core_stream *stream = pipe_ctx->stream;
+
+ if (pipe_ctx->surface != surface)
+ continue;
+
+ resource_build_scaling_params(updates[i].surface, pipe_ctx);
+ if (dc->debug.surface_visual_confirm) {
+ pipe_ctx->scl_data.recout.height -= 2;
+ pipe_ctx->scl_data.recout.width -= 2;
+ }
}
}
@@ -1563,10 +1565,12 @@ void dc_update_surfaces_for_stream(struc
}
if (update_type == UPDATE_TYPE_FULL) {
- core_dc->hwss.apply_ctx_for_surface(core_dc, surface, context);
- } else if (updates[i].flip_addr) {
+ /* only apply for top pipe */
+ if (!pipe_ctx->top_pipe)
+ core_dc->hwss.apply_ctx_for_surface(core_dc,
+ surface, context);
+ } else if (updates[i].flip_addr)
core_dc->hwss.update_plane_addr(core_dc, pipe_ctx);
- }
if (update_type == UPDATE_TYPE_FAST)
continue;