drm/amd/display: Optimize bandwidth on following fast update

commit 34316c1e561db0b24e341029f04a5a5bead9a7bc upstream.

[Why]
The current call to optimize_bandwidth never occurs because flip is
always pending from the FULL and FAST updates.

[How]
Optimize on the following flip when it's a FAST update and we know we
aren't going to be modifying the clocks again.

Reviewed-by: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com>
Acked-by: Mikita Lipski <mikita.lipski@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Mario Limonciello <Mario.Limonciello@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index b37c4d2..46bef17 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1788,6 +1788,11 @@ void dc_post_update_surfaces_to_stream(struct dc *dc)
 
        post_surface_trace(dc);
 
+       if (dc->ctx->dce_version >= DCE_VERSION_MAX)
+               TRACE_DCN_CLOCK_STATE(&context->bw_ctx.bw.dcn.clk);
+       else
+               TRACE_DCE_CLOCK_STATE(&context->bw_ctx.bw.dce);
+
        if (is_flip_pending_in_pipes(dc, context))
                return;
 
@@ -2974,6 +2979,9 @@ void dc_commit_updates_for_stream(struct dc *dc,
                        if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state)
                                new_pipe->plane_state->force_full_update = true;
                }
+       } else if (update_type == UPDATE_TYPE_FAST) {
+               /* Previous frame finished and HW is ready for optimization. */
+               dc_post_update_surfaces_to_stream(dc);
        }
 
 
@@ -3030,15 +3038,6 @@ void dc_commit_updates_for_stream(struct dc *dc,
                                pipe_ctx->plane_state->force_full_update = false;
                }
        }
-       /*let's use current_state to update watermark etc*/
-       if (update_type >= UPDATE_TYPE_FULL) {
-               dc_post_update_surfaces_to_stream(dc);
-
-               if (dc_ctx->dce_version >= DCE_VERSION_MAX)
-                       TRACE_DCN_CLOCK_STATE(&context->bw_ctx.bw.dcn.clk);
-               else
-                       TRACE_DCE_CLOCK_STATE(&context->bw_ctx.bw.dce);
-       }
 
        return;