Skip to content

Commit

Permalink
drm/amd/display: add seamless pipe topology transition check
Browse files Browse the repository at this point in the history
[ Upstream commit 15c6798 ]

[why]
We have a few cases where we need to perform update topology update
in dc update interface. However some of the updates are not seamless
This could cause user noticible glitches. To enforce seamless transition
we are adding a checking condition and error logging so the corruption
as result of non seamless transition can be easily spotted.

Reviewed-by: Dillon Varone <dillon.varone@amd.com>
Acked-by: Stylon Wang <stylon.wang@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Wenjing Liu authored and gregkh committed Nov 28, 2023
1 parent 356dee3 commit de7550f
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/gpu/drm/amd/display/dc/core/dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4414,6 +4414,14 @@ bool dc_update_planes_and_stream(struct dc *dc,
update_type,
context);
} else {
if (!stream_update &&
dc->hwss.is_pipe_topology_transition_seamless &&
!dc->hwss.is_pipe_topology_transition_seamless(
dc, dc->current_state, context)) {

DC_LOG_ERROR("performing non-seamless pipe topology transition with surface only update!\n");
BREAK_TO_DEBUGGER();
}
commit_planes_for_stream(
dc,
srf_updates,
Expand Down
52 changes: 52 additions & 0 deletions drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1621,3 +1621,55 @@ void dcn32_blank_phantom(struct dc *dc,
if (tg->funcs->is_tg_enabled(tg))
hws->funcs.wait_for_blank_complete(opp);
}

bool dcn32_is_pipe_topology_transition_seamless(struct dc *dc,
const struct dc_state *cur_ctx,
const struct dc_state *new_ctx)
{
int i;
const struct pipe_ctx *cur_pipe, *new_pipe;
bool is_seamless = true;

for (i = 0; i < dc->res_pool->pipe_count; i++) {
cur_pipe = &cur_ctx->res_ctx.pipe_ctx[i];
new_pipe = &new_ctx->res_ctx.pipe_ctx[i];

if (resource_is_pipe_type(cur_pipe, FREE_PIPE) ||
resource_is_pipe_type(new_pipe, FREE_PIPE))
/* adding or removing free pipes is always seamless */
continue;
else if (resource_is_pipe_type(cur_pipe, OTG_MASTER)) {
if (resource_is_pipe_type(new_pipe, OTG_MASTER))
if (cur_pipe->stream->stream_id == new_pipe->stream->stream_id)
/* OTG master with the same stream is seamless */
continue;
} else if (resource_is_pipe_type(cur_pipe, OPP_HEAD)) {
if (resource_is_pipe_type(new_pipe, OPP_HEAD)) {
if (cur_pipe->stream_res.tg == new_pipe->stream_res.tg)
/*
* OPP heads sharing the same timing
* generator is seamless
*/
continue;
}
} else if (resource_is_pipe_type(cur_pipe, DPP_PIPE)) {
if (resource_is_pipe_type(new_pipe, DPP_PIPE)) {
if (cur_pipe->stream_res.opp == new_pipe->stream_res.opp)
/*
* DPP pipes sharing the same OPP head is
* seamless
*/
continue;
}
}

/*
* This pipe's transition doesn't fall under any seamless
* conditions
*/
is_seamless = false;
break;
}

return is_seamless;
}
4 changes: 4 additions & 0 deletions drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,8 @@ void dcn32_blank_phantom(struct dc *dc,
int width,
int height);

bool dcn32_is_pipe_topology_transition_seamless(struct dc *dc,
const struct dc_state *cur_ctx,
const struct dc_state *new_ctx);

#endif /* __DC_HWSS_DCN32_H__ */
1 change: 1 addition & 0 deletions drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ static const struct hw_sequencer_funcs dcn32_funcs = {
.update_dsc_pg = dcn32_update_dsc_pg,
.apply_update_flags_for_phantom = dcn32_apply_update_flags_for_phantom,
.blank_phantom = dcn32_blank_phantom,
.is_pipe_topology_transition_seamless = dcn32_is_pipe_topology_transition_seamless,
};

static const struct hwseq_private_funcs dcn32_private_funcs = {
Expand Down
3 changes: 3 additions & 0 deletions drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,9 @@ struct hw_sequencer_funcs {
struct dc_state *context,
struct pipe_ctx *phantom_pipe);
void (*apply_update_flags_for_phantom)(struct pipe_ctx *phantom_pipe);
bool (*is_pipe_topology_transition_seamless)(struct dc *dc,
const struct dc_state *cur_ctx,
const struct dc_state *new_ctx);

void (*commit_subvp_config)(struct dc *dc, struct dc_state *context);
void (*enable_phantom_streams)(struct dc *dc, struct dc_state *context);
Expand Down

0 comments on commit de7550f

Please sign in to comment.