drm/amd/display: Move output_tf to stream_state/update

Signed-off-by: Yongqiang Sun <yongqiang.sun@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/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 836bc3aea2917fce6882e22fe032c7c5e4e9d0f1..efadd7e7f984eb1e42088a80ff5ace341d91d88b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -497,7 +497,6 @@ struct dc_surface_update {
        /* gamma TO BE REMOVED */
        struct dc_gamma *gamma;
        enum color_transfer_func color_input_tf;
-       enum color_transfer_func color_output_tf;
        struct dc_transfer_func *in_transfer_func;
 
        struct csc_transform *input_csc_color_matrix;

diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
index c9e5fe8770da34c47ee906d284dc8a84b6dae025..e23620b09c5b261b00e8797dc27d8e52bb349f1d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
@@ -65,6 +65,7 @@ struct dc_stream_state {
        enum dc_dither_option dither_option;
 
        enum view_3d_format view_format;
+       enum color_transfer_func output_tf;
 
        bool ignore_msa_timing_param;
        /* TODO: custom INFO packets */
@@ -103,6 +104,7 @@ struct dc_stream_update {
        struct rect dst;
        struct dc_transfer_func *out_transfer_func;
        struct dc_hdr_static_metadata *hdr_static_metadata;
+       enum color_transfer_func color_output_tf;
 };
 
 bool dc_is_stream_unchanged(