drm/amd/display: set stream gamut remap matrix to MPC for DCN3+

dc->caps.color.mpc.gamut_remap says there is a post-blending color block
for gamut remap matrix for DCN3 HW family and newer versions. However,
those drivers still follow DCN10 programming that remap stream
gamut_remap_matrix to DPP (pre-blending).

To enable pre-blending and post-blending gamut_remap matrix supports at
the same time, set stream gamut_remap to MPC and plane gamut_remap to
DPP for DCN families that support both.

It was tested using IGT KMS color tests for DRM CRTC CTM property and it
preserves test results.

Signed-off-by: Melissa Wen <mwen@igalia.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-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/dcn30/dcn30_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
index 255713ec29bb0fc794445ff3226bd5d4968b302c..fce9b33c0f8816a77484a1530b9bc49844d6932f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
@@ -186,6 +186,43 @@ bool dcn30_set_input_transfer_func(struct dc *dc,
        return result;
 }
 
+void dcn30_program_gamut_remap(struct pipe_ctx *pipe_ctx)
+{
+       int i = 0;
+       struct dpp_grph_csc_adjustment dpp_adjust;
+       struct mpc_grph_gamut_adjustment mpc_adjust;
+       int mpcc_id = pipe_ctx->plane_res.hubp->inst;
+       struct mpc *mpc = pipe_ctx->stream_res.opp->ctx->dc->res_pool->mpc;
+
+       memset(&dpp_adjust, 0, sizeof(dpp_adjust));
+       dpp_adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_BYPASS;
+
+       if (pipe_ctx->plane_state &&
+           pipe_ctx->plane_state->gamut_remap_matrix.enable_remap == true) {
+               dpp_adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_SW;
+               for (i = 0; i < CSC_TEMPERATURE_MATRIX_SIZE; i++)
+                       dpp_adjust.temperature_matrix[i] =
+                               pipe_ctx->plane_state->gamut_remap_matrix.matrix[i];
+       }
+
+       pipe_ctx->plane_res.dpp->funcs->dpp_set_gamut_remap(pipe_ctx->plane_res.dpp,
+                                                           &dpp_adjust);
+
+       memset(&mpc_adjust, 0, sizeof(mpc_adjust));
+       mpc_adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_BYPASS;
+
+       if (pipe_ctx->top_pipe == NULL) {
+               if (pipe_ctx->stream->gamut_remap_matrix.enable_remap == true) {
+                       mpc_adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_SW;
+                       for (i = 0; i < CSC_TEMPERATURE_MATRIX_SIZE; i++)
+                               mpc_adjust.temperature_matrix[i] =
+                                       pipe_ctx->stream->gamut_remap_matrix.matrix[i];
+               }
+       }
+
+       mpc->funcs->set_gamut_remap(mpc, mpcc_id, &mpc_adjust);
+}
+
 bool dcn30_set_output_transfer_func(struct dc *dc,
                                struct pipe_ctx *pipe_ctx,
                                const struct dc_stream_state *stream)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h
index ce19c54097f8be5a99983e4e54de6449a90e5a14..e557e2b9861870bb17ed1ac70f73e636888528d1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h
@@ -58,6 +58,9 @@ bool dcn30_set_blend_lut(struct pipe_ctx *pipe_ctx,
 bool dcn30_set_input_transfer_func(struct dc *dc,
                                struct pipe_ctx *pipe_ctx,
                                const struct dc_plane_state *plane_state);
+
+void dcn30_program_gamut_remap(struct pipe_ctx *pipe_ctx);
+
 bool dcn30_set_output_transfer_func(struct dc *dc,
                                struct pipe_ctx *pipe_ctx,
                                const struct dc_stream_state *stream);

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c
index 0de8b2783cf682d6576646b8b53248783302ba14..e56fca60a1ed2a4a308280cc69ff3b2205185e82 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c
@@ -32,7 +32,7 @@
 #include "dcn30_init.h"
 
 static const struct hw_sequencer_funcs dcn30_funcs = {
-       .program_gamut_remap = dcn10_program_gamut_remap,
+       .program_gamut_remap = dcn30_program_gamut_remap,
        .init_hw = dcn30_init_hw,
        .apply_ctx_to_hw = dce110_apply_ctx_to_hw,
        .apply_ctx_for_surface = NULL,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
index 61205cdbe2d5abdb73d3249501b12873dae8243a..fdbe3d42cd7b688e9872000971a9220e49889440 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
@@ -33,7 +33,7 @@
 #include "dcn301_init.h"
 
 static const struct hw_sequencer_funcs dcn301_funcs = {
-       .program_gamut_remap = dcn10_program_gamut_remap,
+       .program_gamut_remap = dcn30_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,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c
index 1d7bc1e39afe4c5400077bc261ad1338cd62f6cd..084861519e28a6a4641be0b3e9e9955c6f842844 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c
@@ -34,7 +34,7 @@
 #include "dcn31_init.h"
 
 static const struct hw_sequencer_funcs dcn31_funcs = {
-       .program_gamut_remap = dcn10_program_gamut_remap,
+       .program_gamut_remap = dcn30_program_gamut_remap,
        .init_hw = dcn31_init_hw,
        .power_down_on_boot = dcn10_power_down_on_boot,
        .apply_ctx_to_hw = dce110_apply_ctx_to_hw,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c
index 4ef85c3a0688f96058053fbd80b66fcda41710d9..163dd563b2090f31f0a4fad8b57db8eaa3ccfc9e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c
@@ -36,7 +36,7 @@
 #include "dcn314_init.h"
 
 static const struct hw_sequencer_funcs dcn314_funcs = {
-       .program_gamut_remap = dcn10_program_gamut_remap,
+       .program_gamut_remap = dcn30_program_gamut_remap,
        .init_hw = dcn31_init_hw,
        .power_down_on_boot = dcn10_power_down_on_boot,
        .apply_ctx_to_hw = dce110_apply_ctx_to_hw,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c
index 1edadff39a5eff9115c2706c8cab4aa8cf9764df..6e7f6df1d4231dccbf4e9da9ffbaba895d9b75fb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c
@@ -33,7 +33,7 @@
 #include "dcn32_init.h"
 
 static const struct hw_sequencer_funcs dcn32_funcs = {
-       .program_gamut_remap = dcn10_program_gamut_remap,
+       .program_gamut_remap = dcn30_program_gamut_remap,
        .init_hw = dcn32_init_hw,
        .apply_ctx_to_hw = dce110_apply_ctx_to_hw,
        .apply_ctx_for_surface = NULL,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c
index a9553a87b9599c3d7c077cb688fe386107036a12..ae828d5f4e348dd310c3da159ebaec15a29efd19 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c
@@ -35,7 +35,7 @@
 #include "dcn35_init.h"
 
 static const struct hw_sequencer_funcs dcn35_funcs = {
-       .program_gamut_remap = dcn10_program_gamut_remap,
+       .program_gamut_remap = dcn30_program_gamut_remap,
        .init_hw = dcn35_init_hw,
        .power_down_on_boot = dcn35_power_down_on_boot,
        .apply_ctx_to_hw = dce110_apply_ctx_to_hw,