Commit 8b0fbb36 authored by Noah Abradjian's avatar Noah Abradjian Committed by Alex Deucher

drm/amd/display: Modify logic for when to wait for mpcc idle

[Why]
I was advised that we may need to check for mpcc idle in more cases
than just when opp_changed is true. Also, mpcc_inst is equal to
pipe_idx, so remove for loop.

[How]
Remove opp_changed flag check and mpcc_inst loop.
Signed-off-by: default avatarNoah Abradjian <noah.abradjian@amd.com>
Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5fd21b39
...@@ -1349,16 +1349,16 @@ static void dcn20_update_dchubp_dpp( ...@@ -1349,16 +1349,16 @@ static void dcn20_update_dchubp_dpp(
if (pipe_ctx->update_flags.bits.mpcc if (pipe_ctx->update_flags.bits.mpcc
|| plane_state->update_flags.bits.global_alpha_change || plane_state->update_flags.bits.global_alpha_change
|| plane_state->update_flags.bits.per_pixel_alpha_change) { || plane_state->update_flags.bits.per_pixel_alpha_change) {
/* Need mpcc to be idle if changing opp */ // MPCC inst is equal to pipe index in practice
if (pipe_ctx->update_flags.bits.opp_changed) { int mpcc_inst = pipe_ctx->pipe_idx;
struct pipe_ctx *old_pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[pipe_ctx->pipe_idx]; int opp_inst;
int mpcc_inst; int opp_count = dc->res_pool->res_cap->num_opp;
for (mpcc_inst = 0; mpcc_inst < MAX_PIPES; mpcc_inst++) { for (opp_inst = 0; opp_inst < opp_count; opp_inst++) {
if (!old_pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst]) if (dc->res_pool->opps[opp_inst]->mpcc_disconnect_pending[mpcc_inst]) {
continue;
dc->res_pool->mpc->funcs->wait_for_idle(dc->res_pool->mpc, mpcc_inst); dc->res_pool->mpc->funcs->wait_for_idle(dc->res_pool->mpc, mpcc_inst);
old_pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst] = false; dc->res_pool->opps[opp_inst]->mpcc_disconnect_pending[mpcc_inst] = false;
break;
} }
} }
hws->funcs.update_mpcc(dc, pipe_ctx); hws->funcs.update_mpcc(dc, pipe_ctx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment