drm/amd/display: update DCN to use new surface programming

[Why]
The split pipe config is updated due to antoher stream bandwidth
validataion. Driver doesn't reprogram the split pipe config
to signle pipe cause SW use signel pipe but HW still use pipe split.

[How]
track global updates and update any hw that isn't
related to current stream being updated.

Signed-off-by: Paul Hsieh <paul.hsieh@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Wayne Lin <Wayne.Lin@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/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 7c939c0a977b31afc904552aca8b018c32aa1840..8c2d3d42d9da26f8c49f98573e4a23857ef79f5c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -2956,35 +2956,6 @@ void dcn10_program_pipe(
 {
        struct dce_hwseq *hws = dc->hwseq;
 
-       if (pipe_ctx->plane_state->update_flags.bits.full_update)
-               dcn10_enable_plane(dc, pipe_ctx, context);
-
-       dcn10_update_dchubp_dpp(dc, pipe_ctx, context);
-
-       hws->funcs.set_hdr_multiplier(pipe_ctx);
-
-       if (pipe_ctx->plane_state->update_flags.bits.full_update ||
-                       pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change ||
-                       pipe_ctx->plane_state->update_flags.bits.gamma_change)
-               hws->funcs.set_input_transfer_func(dc, pipe_ctx, pipe_ctx->plane_state);
-
-       /* dcn10_translate_regamma_to_hw_format takes 750us to finish
-        * only do gamma programming for full update.
-        * TODO: This can be further optimized/cleaned up
-        * Always call this for now since it does memcmp inside before
-        * doing heavy calculation and programming
-        */
-       if (pipe_ctx->plane_state->update_flags.bits.full_update)
-               hws->funcs.set_output_transfer_func(dc, pipe_ctx, pipe_ctx->stream);
-}
-
-static void dcn10_program_all_pipe_in_tree(
-               struct dc *dc,
-               struct pipe_ctx *pipe_ctx,
-               struct dc_state *context)
-{
-       struct dce_hwseq *hws = dc->hwseq;
-
        if (pipe_ctx->top_pipe == NULL) {
                bool blank = !is_pipe_tree_visible(pipe_ctx);
 
@@ -3004,35 +2975,26 @@ static void dcn10_program_all_pipe_in_tree(
                hws->funcs.blank_pixel_data(dc, pipe_ctx, blank);
        }
 
-       if (pipe_ctx->plane_state != NULL)
-               hws->funcs.program_pipe(dc, pipe_ctx, context);
-
-       if (pipe_ctx->bottom_pipe != NULL && pipe_ctx->bottom_pipe != pipe_ctx)
-               dcn10_program_all_pipe_in_tree(dc, pipe_ctx->bottom_pipe, context);
-}
-
-static struct pipe_ctx *dcn10_find_top_pipe_for_stream(
-               struct dc *dc,
-               struct dc_state *context,
-               const struct dc_stream_state *stream)
-{
-       int i;
+       if (pipe_ctx->plane_state->update_flags.bits.full_update)
+               dcn10_enable_plane(dc, pipe_ctx, context);
 
-       for (i = 0; i < dc->res_pool->pipe_count; i++) {
-               struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
-               struct pipe_ctx *old_pipe_ctx =
-                               &dc->current_state->res_ctx.pipe_ctx[i];
+       dcn10_update_dchubp_dpp(dc, pipe_ctx, context);
 
-               if (!pipe_ctx->plane_state && !old_pipe_ctx->plane_state)
-                       continue;
+       hws->funcs.set_hdr_multiplier(pipe_ctx);
 
-               if (pipe_ctx->stream != stream)
-                       continue;
+       if (pipe_ctx->plane_state->update_flags.bits.full_update ||
+                       pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change ||
+                       pipe_ctx->plane_state->update_flags.bits.gamma_change)
+               hws->funcs.set_input_transfer_func(dc, pipe_ctx, pipe_ctx->plane_state);
 
-               if (!pipe_ctx->top_pipe && !pipe_ctx->prev_odm_pipe)
-                       return pipe_ctx;
-       }
-       return NULL;
+       /* dcn10_translate_regamma_to_hw_format takes 750us to finish
+        * only do gamma programming for full update.
+        * TODO: This can be further optimized/cleaned up
+        * Always call this for now since it does memcmp inside before
+        * doing heavy calculation and programming
+        */
+       if (pipe_ctx->plane_state->update_flags.bits.full_update)
+               hws->funcs.set_output_transfer_func(dc, pipe_ctx, pipe_ctx->stream);
 }
 
 void dcn10_wait_for_pending_cleared(struct dc *dc,
@@ -3067,91 +3029,6 @@ void dcn10_wait_for_pending_cleared(struct dc *dc,
                }
 }
 
-void dcn10_apply_ctx_for_surface(
-               struct dc *dc,
-               const struct dc_stream_state *stream,
-               int num_planes,
-               struct dc_state *context)
-{
-       struct dce_hwseq *hws = dc->hwseq;
-       int i;
-       struct timing_generator *tg;
-       uint32_t underflow_check_delay_us;
-       bool interdependent_update = false;
-       struct pipe_ctx *top_pipe_to_program =
-                       dcn10_find_top_pipe_for_stream(dc, context, stream);
-       DC_LOGGER_INIT(dc->ctx->logger);
-
-       // Clear pipe_ctx flag
-       for (i = 0; i < dc->res_pool->pipe_count; i++) {
-               struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
-               pipe_ctx->update_flags.raw = 0;
-       }
-
-       if (!top_pipe_to_program)
-               return;
-
-       tg = top_pipe_to_program->stream_res.tg;
-
-       interdependent_update = top_pipe_to_program->plane_state &&
-               top_pipe_to_program->plane_state->update_flags.bits.full_update;
-
-       underflow_check_delay_us = dc->debug.underflow_assert_delay_us;
-
-       if (underflow_check_delay_us != 0xFFFFFFFF && hws->funcs.did_underflow_occur)
-               ASSERT(hws->funcs.did_underflow_occur(dc, top_pipe_to_program));
-
-       if (underflow_check_delay_us != 0xFFFFFFFF)
-               udelay(underflow_check_delay_us);
-
-       if (underflow_check_delay_us != 0xFFFFFFFF && hws->funcs.did_underflow_occur)
-               ASSERT(hws->funcs.did_underflow_occur(dc, top_pipe_to_program));
-
-       if (num_planes == 0) {
-               /* OTG blank before remove all front end */
-               hws->funcs.blank_pixel_data(dc, top_pipe_to_program, true);
-       }
-
-       /* Disconnect unused mpcc */
-       for (i = 0; i < dc->res_pool->pipe_count; i++) {
-               struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
-               struct pipe_ctx *old_pipe_ctx =
-                               &dc->current_state->res_ctx.pipe_ctx[i];
-
-               if ((!pipe_ctx->plane_state ||
-                    pipe_ctx->stream_res.tg != old_pipe_ctx->stream_res.tg) &&
-                   old_pipe_ctx->plane_state &&
-                   old_pipe_ctx->stream_res.tg == tg) {
-
-                       hws->funcs.plane_atomic_disconnect(dc, old_pipe_ctx);
-                       pipe_ctx->update_flags.bits.disable = 1;
-
-                       DC_LOG_DC("Reset mpcc for pipe %d\n",
-                                       old_pipe_ctx->pipe_idx);
-               }
-       }
-
-       if (num_planes > 0)
-               dcn10_program_all_pipe_in_tree(dc, top_pipe_to_program, context);
-
-       /* Program secondary blending tree and writeback pipes */
-       if ((stream->num_wb_info > 0) && (hws->funcs.program_all_writeback_pipes_in_tree))
-               hws->funcs.program_all_writeback_pipes_in_tree(dc, stream, context);
-       if (interdependent_update)
-               for (i = 0; i < dc->res_pool->pipe_count; i++) {
-                       struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
-                       /* Skip inactive pipes and ones already updated */
-                       if (!pipe_ctx->stream || pipe_ctx->stream == stream ||
-                           !pipe_ctx->plane_state || !tg->funcs->is_tg_enabled(tg))
-                               continue;
-
-                       pipe_ctx->plane_res.hubp->funcs->hubp_setup_interdependent(
-                               pipe_ctx->plane_res.hubp,
-                               &pipe_ctx->dlg_regs,
-                               &pipe_ctx->ttu_regs);
-               }
-}
-
 void dcn10_post_unlock_program_front_end(
                struct dc *dc,
                struct dc_state *context)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h
index 37bec421fde8e34c70d32cb986246193c79ea666..c9bdffe5989bc0e6552392b9fcb70d8f3dba68df 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h
@@ -80,11 +80,6 @@ void dcn10_lock_all_pipes(
                struct dc *dc,
                struct dc_state *context,
                bool lock);
-void dcn10_apply_ctx_for_surface(
-               struct dc *dc,
-               const struct dc_stream_state *stream,
-               int num_planes,
-               struct dc_state *context);
 void dcn10_post_unlock_program_front_end(
                struct dc *dc,
                struct dc_state *context);

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c
index d532c78ee76472087fcdb37475b9053b0305f1ed..680ca53455a2e2cf127fb0e4b746128bf4102023 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c
@@ -26,13 +26,15 @@
 #include "hw_sequencer_private.h"
 #include "dce110/dce110_hw_sequencer.h"
 #include "dcn10_hw_sequencer.h"
+#include "dcn20/dcn20_hwseq.h"
 
 static const struct hw_sequencer_funcs dcn10_funcs = {
        .program_gamut_remap = dcn10_program_gamut_remap,
        .init_hw = dcn10_init_hw,
        .power_down_on_boot = dcn10_power_down_on_boot,
        .apply_ctx_to_hw = dce110_apply_ctx_to_hw,
-       .apply_ctx_for_surface = dcn10_apply_ctx_for_surface,
+       .apply_ctx_for_surface = NULL,
+       .program_front_end_for_ctx = dcn20_program_front_end_for_ctx,
        .post_unlock_program_front_end = dcn10_post_unlock_program_front_end,
        .wait_for_pending_cleared = dcn10_wait_for_pending_cleared,
        .update_plane_addr = dcn10_update_plane_addr,

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 6a10daec15ccd03b096755f3cee40eccf12edf45..484a30592987f26733ffc2466227cbcaa20472d6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -1700,7 +1700,11 @@ void dcn20_program_front_end_for_ctx(
 
                if (pipe->plane_state && !pipe->top_pipe) {
                        while (pipe) {
-                               dcn20_program_pipe(dc, pipe, context);
+                               if (hws->funcs.program_pipe)
+                                       hws->funcs.program_pipe(dc, pipe, context);
+                               else
+                                       dcn20_program_pipe(dc, pipe, context);
+
                                pipe = pipe->bottom_pipe;
                        }
                        /* Program secondary blending tree and writeback pipes */