drm/amd/display: determine fast update only before commit minimal transition state

[why]
commit minimal transition state would update current
state to new state with surface and stream update
applied. If we determine fast update only after we
have committed the minimal transition state based on
new state, we will skip committing the full new state.

[how]
determine fast update only earlier based on the
actaul currents state. Only skip full commit when
the transition between actual current state and new
state is fast update only.

Reviewed-by: Aric Cyr <aric.cyr@amd.com>
Acked-by: Wayne Lin <wayne.lin@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>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index f91d0f6b0d7daa7b059338f31ffeb2204116f9ad..195ea6286c33a6f534e4f7ab845ee5df560f2daf 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -4307,8 +4307,11 @@ bool dc_update_planes_and_stream(struct dc *dc,
         */
        bool force_minimal_pipe_splitting = 0;
        bool is_plane_addition = 0;
+       bool is_fast_update_only;
 
        populate_fast_updates(fast_update, srf_updates, surface_count, stream_update);
+       is_fast_update_only = fast_update_only(dc, fast_update, srf_updates,
+                       surface_count, stream_update, stream);
        force_minimal_pipe_splitting = could_mpcc_tree_change_for_active_pipes(
                        dc,
                        stream,
@@ -4360,8 +4363,7 @@ bool dc_update_planes_and_stream(struct dc *dc,
        }
 
        update_seamless_boot_flags(dc, context, surface_count, stream);
-       if (fast_update_only(dc, fast_update, srf_updates, surface_count, stream_update, stream) &&
-                       !dc->debug.enable_legacy_fast_update) {
+       if (is_fast_update_only && !dc->debug.enable_legacy_fast_update) {
                commit_planes_for_stream_fast(dc,
                                srf_updates,
                                surface_count,