drm/amd/display: Program csc matrix as part of stream update

Add csc_transform struct to dc_stream_update, and program if set when
updating streams

Signed-off-by: SivapiriyanKumarasamy <sivapiriyan.kumarasamy@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@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 99450293a1c5294c7efb64b856bc8394f8a9b582..32318b4e0d1e9dec88e6b66dd349f80539cfcc07 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -379,6 +379,27 @@ bool dc_stream_set_gamut_remap(struct dc *dc, const struct dc_stream_state *stre
        return ret;
 }
 
+bool dc_stream_program_csc_matrix(struct dc *dc, struct dc_stream_state *stream)
+{
+       int i = 0;
+       bool ret = false;
+       struct pipe_ctx *pipes;
+
+       for (i = 0; i < MAX_PIPES; i++) {
+               if (dc->current_state->res_ctx.pipe_ctx[i].stream
+                               == stream) {
+
+                       pipes = &dc->current_state->res_ctx.pipe_ctx[i];
+                       dc->hwss.program_csc_matrix(pipes,
+                       stream->output_color_space,
+                       stream->csc_color_matrix.matrix);
+                       ret = true;
+               }
+       }
+
+       return ret;
+}
+
 void dc_stream_set_static_screen_events(struct dc *dc,
                struct dc_stream_state **streams,
                int num_streams,
@@ -1387,6 +1408,9 @@ static void commit_planes_do_stream_update(struct dc *dc,
                        if (stream_update->gamut_remap)
                                dc_stream_set_gamut_remap(dc, stream);
 
+                       if (stream_update->output_csc_transform)
+                               dc_stream_program_csc_matrix(dc, stream);
+
                        /* Full fe update*/
                        if (update_type == UPDATE_TYPE_FAST)
                                continue;

diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
index 1479b41ec1777476bb885852232ae9bc575a33f6..4a9f7e5daccfbdb38a053cc47707a5d71f8d66e3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
@@ -136,6 +136,7 @@ struct dc_stream_update {
        struct colorspace_transform *gamut_remap;
        enum dc_color_space *output_color_space;
 
+       struct dc_csc_transform *output_csc_transform;
 
 };
 
@@ -306,6 +307,9 @@ void dc_stream_set_dither_option(struct dc_stream_state *stream,
 bool dc_stream_set_gamut_remap(struct dc *dc,
                               const struct dc_stream_state *stream);
 
+bool dc_stream_program_csc_matrix(struct dc *dc,
+                                 struct dc_stream_state *stream);
+
 bool dc_stream_get_crtc_position(struct dc *dc,
                                 struct dc_stream_state **stream,
                                 int num_streams,