drm/amd/display: Clean up DCN cursor code

Signed-off-by: Eric Bernstein <eric.bernstein@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/dcn10/dcn10_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
index 90c57a5..943b7ac 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
@@ -776,27 +776,6 @@ void hubp1_read_state(struct dcn10_hubp *hubp1,
                        QoS_LEVEL_HIGH_WM, &s->qos_level_high_wm);
 }
 
-bool hubp1_cursor_program_control(
-               struct dcn10_hubp *hubp1,
-               bool pixel_data_invert,
-               enum dc_cursor_color_format color_format)
-{
-       if (REG(CURSOR_SETTINS))
-               REG_SET_2(CURSOR_SETTINS, 0,
-                               /* no shift of the cursor HDL schedule */
-                               CURSOR0_DST_Y_OFFSET, 0,
-                                /* used to shift the cursor chunk request deadline */
-                               CURSOR0_CHUNK_HDL_ADJUST, 3);
-       else
-               REG_SET_2(CURSOR_SETTINGS, 0,
-                               /* no shift of the cursor HDL schedule */
-                               CURSOR0_DST_Y_OFFSET, 0,
-                                /* used to shift the cursor chunk request deadline */
-                               CURSOR0_CHUNK_HDL_ADJUST, 3);
-
-       return true;
-}
-
 enum cursor_pitch hubp1_get_cursor_pitch(unsigned int pitch)
 {
        enum cursor_pitch hw_pitch;
@@ -866,9 +845,11 @@ void hubp1_cursor_set_attributes(
                        CURSOR_PITCH, hw_pitch,
                        CURSOR_LINES_PER_CHUNK, lpc);
 
-       hubp1_cursor_program_control(hubp1,
-                       attr->attribute_flags.bits.INVERT_PIXEL_DATA,
-                       attr->color_format);
+       REG_SET_2(CURSOR_SETTINS, 0,
+                       /* no shift of the cursor HDL schedule */
+                       CURSOR0_DST_Y_OFFSET, 0,
+                        /* used to shift the cursor chunk request deadline */
+                       CURSOR0_CHUNK_HDL_ADJUST, 3);
 }
 
 void hubp1_cursor_set_position(

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
index 17a5db0..58a792f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
@@ -683,9 +683,4 @@ void hubp1_read_state(struct dcn10_hubp *hubp1,
 
 enum cursor_pitch hubp1_get_cursor_pitch(unsigned int pitch);
 
-bool hubp1_cursor_program_control(
-               struct dcn10_hubp *hubp1,
-               bool pixel_data_invert,
-               enum dc_cursor_color_format color_format);
-
 #endif