diff options
| author | Aric Cyr <aric.cyr@amd.com> | 2019-05-17 01:43:54 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-05-31 18:39:33 +0300 |
| commit | 4fd334122399a133ddaee8ef865eb10a1cf8000f (patch) | |
| tree | e89a25f0d88d03d3dc9f372b410cf7f80029e556 /drivers/gpu/drm/amd/display/dc | |
| parent | 6ad34adeaec5b56a5ba90e90099cabf1c1fe9dd2 (diff) | |
| download | linux-4fd334122399a133ddaee8ef865eb10a1cf8000f.tar.xz | |
drm/amd/display: program manual trigger only for bottom most pipe
[Why]
We only want to manual trigger end-of-frame when the bottom-most
pipe is flipped to prevent overlays from ending the frame too early.
[How]
Check that the manual trigger is only firing on bottom plane.
Signed-off-by: Aric Cyr <aric.cyr@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 49be32863044..d89a29bd8785 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1781,14 +1781,14 @@ static void commit_planes_for_stream(struct dc *dc, dc->hwss.pipe_control_lock(dc, top_pipe_to_program, false); } - // Fire manual trigger - for (i = 0; i < dc->res_pool->pipe_count; i++) { - struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; + // Fire manual trigger only when bottom plane is flipped + for (j = 0; j < dc->res_pool->pipe_count; j++) { + struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j]; - if (pipe_ctx->top_pipe || - !pipe_ctx->stream || - pipe_ctx->stream != stream || - !srf_updates[i].flip_addr) + if (pipe_ctx->bottom_pipe || + !pipe_ctx->stream || + pipe_ctx->stream != stream || + !pipe_ctx->plane_state->update_flags.bits.addr_update) continue; if (pipe_ctx->stream_res.tg->funcs->program_manual_trigger) |