drm/amd/display: Call program_gamut explicitly instead of entire set_plane

This fixes on boot crush on Vega, Polaris with Dal3.

Signed-off-by: Zeyu Fan <Zeyu.Fan@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@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 f5102b644942ee805453ad63e3ac12e886e18536..657e10bae93f34c53bef5fc1bc1ebef2194573c3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -213,8 +213,7 @@ static bool set_gamut_remap(struct dc *dc, const struct dc_stream *stream)
                                == core_stream) {
 
                        pipes = &core_dc->current_context->res_ctx.pipe_ctx[i];
-                       core_dc->hwss.set_plane_config(core_dc, pipes,
-                                       &core_dc->current_context->res_ctx);
+                       core_dc->hwss.program_gamut_remap(pipes);
                        ret = true;
                }
        }

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 7dd4b02b5938669ed774d271c7cdedf66d942511..616533e25534cb77037ced782b593354a5d0739c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1894,6 +1894,47 @@ static void program_surface_visibility(const struct core_dc *dc,
 
 }
 
+static void program_gamut_remap(struct pipe_ctx *pipe_ctx)
+{
+       struct xfm_grph_csc_adjustment adjust;
+       memset(&adjust, 0, sizeof(adjust));
+       adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_BYPASS;
+
+
+       if (pipe_ctx->stream->public.gamut_remap_matrix.enable_remap == true) {
+               adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_SW;
+               adjust.temperature_matrix[0] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[0];
+               adjust.temperature_matrix[1] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[1];
+               adjust.temperature_matrix[2] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[2];
+               adjust.temperature_matrix[3] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[4];
+               adjust.temperature_matrix[4] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[5];
+               adjust.temperature_matrix[5] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[6];
+               adjust.temperature_matrix[6] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[8];
+               adjust.temperature_matrix[7] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[9];
+               adjust.temperature_matrix[8] =
+                               pipe_ctx->stream->
+                               public.gamut_remap_matrix.matrix[10];
+       }
+
+       pipe_ctx->xfm->funcs->transform_set_gamut_remap(pipe_ctx->xfm, &adjust);
+}
+
 /**
  * TODO REMOVE, USE UPDATE INSTEAD
  */
@@ -2509,6 +2550,7 @@ static void dce110_power_down_fe(struct core_dc *dc, struct pipe_ctx *pipe)
 }
 
 static const struct hw_sequencer_funcs dce110_funcs = {
+       .program_gamut_remap = program_gamut_remap,
        .init_hw = init_hw,
        .apply_ctx_to_hw = dce110_apply_ctx_to_hw,
        .apply_ctx_for_surface = dce110_apply_ctx_for_surface,

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 447f6bf4644c763f851659ce2c8c41484b949404..107f82df3053e036ee48dabeaabd4715130e8b7a 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
@@ -1899,6 +1899,7 @@ static void set_plane_config(
 }
 
 static const struct hw_sequencer_funcs dcn10_funcs = {
+       .program_gamut_remap = program_gamut_remap,
        .init_hw = init_hw,
        .apply_ctx_to_hw = dce110_apply_ctx_to_hw,
        .apply_ctx_for_surface = dcn10_apply_ctx_for_surface,

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h b/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h
index b53e1206dfb35110d12eb75bd314a0c378583254..6f8733ec9b1605c9d9d6e46ba2cdd44f6391570f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h
@@ -67,6 +67,9 @@ struct hw_sequencer_funcs {
                        struct pipe_ctx *pipe_ctx,
                        struct resource_context *res_ctx);
 
+       void (*program_gamut_remap)(
+                       struct pipe_ctx *pipe_ctx);
+
        void (*update_plane_addr)(
                const struct core_dc *dc,
                struct pipe_ctx *pipe_ctx);