drm/amd/display: Get rid of unused input_tf

Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@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/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 2514d7b3b66e13e0800c0ef13354eda34c7b6b86..aa8e25a9b09e13e1e4a894f296046f9a763c1f43 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4034,7 +4034,6 @@ static bool commit_planes_to_stream(
                flip_addr[i].address = plane_states[i]->address;
                flip_addr[i].flip_immediate = plane_states[i]->flip_immediate;
                plane_info[i].color_space = plane_states[i]->color_space;
-               plane_info[i].input_tf = plane_states[i]->input_tf;
                plane_info[i].format = plane_states[i]->format;
                plane_info[i].plane_size = plane_states[i]->plane_size;
                plane_info[i].rotation = plane_states[i]->rotation;

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 8f09f3ab0c2919ca69ec26c97036c6250a6f2ff0..e59357724eac1fcda676714875352c66458ecf92 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1018,9 +1018,6 @@ static enum surface_update_type get_plane_info_update_type(const struct dc_surfa
        if (u->plane_info->color_space != u->surface->color_space)
                update_flags->bits.color_space_change = 1;
 
-       if (u->plane_info->input_tf != u->surface->input_tf)
-               update_flags->bits.input_tf_change = 1;
-
        if (u->plane_info->horizontal_mirror != u->surface->horizontal_mirror)
                update_flags->bits.horizontal_mirror_change = 1;
 

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_debug.c b/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
index a3c87611220d9814209c5a33f06d09664b620751..267c76766deaec45caac0e792dd698ffdff10159 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
@@ -155,7 +155,6 @@ void pre_surface_trace(
                                "plane_state->tiling_info.gfx8.pipe_config = %d;\n"
                                "plane_state->tiling_info.gfx8.array_mode = %d;\n"
                                "plane_state->color_space = %d;\n"
-                               "plane_state->input_tf = %d;\n"
                                "plane_state->dcc.enable = %d;\n"
                                "plane_state->format = %d;\n"
                                "plane_state->rotation = %d;\n"
@@ -163,7 +162,6 @@ void pre_surface_trace(
                                plane_state->tiling_info.gfx8.pipe_config,
                                plane_state->tiling_info.gfx8.array_mode,
                                plane_state->color_space,
-                               plane_state->input_tf,
                                plane_state->dcc.enable,
                                plane_state->format,
                                plane_state->rotation,
@@ -203,7 +201,6 @@ void update_surface_trace(
                if (update->plane_info) {
                        SURFACE_TRACE(
                                        "plane_info->color_space = %d;\n"
-                                       "plane_info->input_tf = %d;\n"
                                        "plane_info->format = %d;\n"
                                        "plane_info->plane_size.grph.surface_pitch = %d;\n"
                                        "plane_info->plane_size.grph.surface_size.height = %d;\n"
@@ -213,7 +210,6 @@ void update_surface_trace(
                                        "plane_info->rotation = %d;\n"
                                        "plane_info->stereo_format = %d;\n",
                                        update->plane_info->color_space,
-                                       update->plane_info->input_tf,
                                        update->plane_info->format,
                                        update->plane_info->plane_size.grph.surface_pitch,
                                        update->plane_info->plane_size.grph.surface_size.height,

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 23349148c7a4dc5cbdd959c8562bc86198a31b8f..6a47da30b28133d55aca4d224819da7986fab6e2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -333,7 +333,6 @@ enum {
        TRANSFER_FUNC_POINTS = 1025
 };
 
-// Moved here from color module for linux
 enum color_transfer_func {
        transfer_func_unknown,
        transfer_func_srgb,
@@ -420,7 +419,6 @@ union surface_update_flags {
                /* Medium updates */
                uint32_t dcc_change:1;
                uint32_t color_space_change:1;
-               uint32_t input_tf_change:1;
                uint32_t horizontal_mirror_change:1;
                uint32_t per_pixel_alpha_change:1;
                uint32_t rotation_change:1;
@@ -470,7 +468,6 @@ struct dc_plane_state {
        struct dc_hdr_static_metadata hdr_static_ctx;
 
        enum dc_color_space color_space;
-       enum color_transfer_func input_tf;
 
        enum surface_pixel_format format;
        enum dc_rotation_angle rotation;
@@ -500,7 +497,6 @@ struct dc_plane_info {
        enum dc_rotation_angle rotation;
        enum plane_stereo_format stereo_format;
        enum dc_color_space color_space;
-       enum color_transfer_func input_tf;
        unsigned int sdr_white_level;
        bool horizontal_mirror;
        bool visible;
@@ -527,7 +523,6 @@ struct dc_surface_update {
         * null means no updates
         */
        struct dc_gamma *gamma;
-       enum color_transfer_func color_input_tf;
        struct dc_transfer_func *in_transfer_func;
 
        struct csc_transform *input_csc_color_matrix;