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: Noah Abradjian <noah.abradjian@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
index 3b8b9944d9723f80a26075d69da09b4cd73b7e66..6a0d280bafbafd4bc9fc4c2a9c7018df08f5a5b1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -1349,16 +1349,16 @@ static void dcn20_update_dchubp_dpp(
        if (pipe_ctx->update_flags.bits.mpcc
                        || plane_state->update_flags.bits.global_alpha_change
                        || plane_state->update_flags.bits.per_pixel_alpha_change) {
-               /* Need mpcc to be idle if changing opp */
-               if (pipe_ctx->update_flags.bits.opp_changed) {
-                       struct pipe_ctx *old_pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[pipe_ctx->pipe_idx];
-                       int mpcc_inst;
-
-                       for (mpcc_inst = 0; mpcc_inst < MAX_PIPES; mpcc_inst++) {
-                               if (!old_pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst])
-                                       continue;
+               // MPCC inst is equal to pipe index in practice
+               int mpcc_inst = pipe_ctx->pipe_idx;
+               int opp_inst;
+               int opp_count = dc->res_pool->res_cap->num_opp;
+
+               for (opp_inst = 0; opp_inst < opp_count; opp_inst++) {
+                       if (dc->res_pool->opps[opp_inst]->mpcc_disconnect_pending[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);