diff options
| author | Yongqiang Sun <yongqiang.sun@amd.com> | 2017-01-19 10:53:58 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:11:47 -0400 |
| commit | dcbd4ee0fabcc1f6a40d67e8a8621e9ac5a382ac (patch) | |
| tree | f3ea3b4151a79ca7263e78521115865a986d13d4 | |
| parent | 4d35b093e635de739d0bdcbb57244424cb1abb61 (diff) | |
| download | linux-stable-dcbd4ee0fabcc1f6a40d67e8a8621e9ac5a382ac.tar.gz linux-stable-dcbd4ee0fabcc1f6a40d67e8a8621e9ac5a382ac.zip | |
drm/amd/display: Change update surface condition, fix surface transition corruption.
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>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 270f8c5cfeda..de6ef8713ea8 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1497,7 +1497,6 @@ void dc_update_surfaces_for_stream(struct dc *dc, struct dc_surface_update *upda for (i = 0; i < surface_count; i++) { struct core_surface *surface = DC_SURFACE_TO_CORE(updates[i].surface); - bool apply_ctx = false; for (j = 0; j < context->res_ctx.pool->pipe_count; j++) { struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j]; @@ -1505,13 +1504,9 @@ void dc_update_surfaces_for_stream(struct dc *dc, struct dc_surface_update *upda if (pipe_ctx->surface != surface) continue; - if (updates[i].flip_addr) { + if (updates[i].flip_addr && can_skip_context_building) { core_dc->hwss.update_plane_addr(core_dc, pipe_ctx); - } - - if (updates[i].plane_info || updates[i].scaling_info - || is_new_pipe_surface[j]) { - apply_ctx = true; + } else { if (!pipe_ctx->tg->funcs->is_blanked(pipe_ctx->tg)) { core_dc->hwss.pipe_control_lock( @@ -1546,7 +1541,7 @@ void dc_update_surfaces_for_stream(struct dc *dc, struct dc_surface_update *upda } } - if (apply_ctx) { + if (!can_skip_context_building) { core_dc->hwss.apply_ctx_for_surface(core_dc, surface, context); context_timing_trace(dc, &context->res_ctx); } |