drm/amd/display: Remove extra arr_points element

arr_points[1] and [2] were duplicated. Remove the extra
one. If we ever need more points we can add them but the
current state of affairs is confusing.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@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/dce/dce_transform.c b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
index 4ff874a..543b490 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
@@ -1277,7 +1277,7 @@ static void regamma_config_regions_and_segments(struct dce_transform *xfm_dce,
 
        REG_SET_2(REGAMMA_CNTLA_END_CNTL2, 0,
                  REGAMMA_CNTLA_EXP_REGION_END_BASE, params->arr_points[1].custom_float_y,
-                 REGAMMA_CNTLA_EXP_REGION_END_SLOPE, params->arr_points[2].custom_float_slope);
+                 REGAMMA_CNTLA_EXP_REGION_END_SLOPE, params->arr_points[1].custom_float_slope);
 
        curve = params->arr_curve_points;
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index d22745e..6b3ab43 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -539,8 +539,6 @@ static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func
                        dal_fixed31_32_from_int(segment_start));
        arr_points[1].x = dal_fixed31_32_pow(dal_fixed31_32_from_int(2),
                        dal_fixed31_32_from_int(segment_end));
-       arr_points[2].x = dal_fixed31_32_pow(dal_fixed31_32_from_int(2),
-                       dal_fixed31_32_from_int(segment_end));
 
        y_r = rgb_resulted[0].red;
        y_g = rgb_resulted[0].green;
@@ -563,10 +561,8 @@ static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func
        y3_max = dal_fixed31_32_max(y_r, dal_fixed31_32_max(y_g, y_b));
 
        arr_points[1].y = y3_max;
-       arr_points[2].y = y3_max;
 
        arr_points[1].slope = dal_fixed31_32_zero;
-       arr_points[2].slope = dal_fixed31_32_zero;
 
        if (output_tf->tf == TRANSFER_FUNCTION_PQ) {
                /* for PQ, we want to have a straight line from last HW X point,
@@ -578,9 +574,6 @@ static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func
                arr_points[1].slope = dal_fixed31_32_div(
                        dal_fixed31_32_sub(dal_fixed31_32_one, arr_points[1].y),
                        dal_fixed31_32_sub(end_value, arr_points[1].x));
-               arr_points[2].slope = dal_fixed31_32_div(
-                       dal_fixed31_32_sub(dal_fixed31_32_one, arr_points[1].y),
-                       dal_fixed31_32_sub(end_value, arr_points[1].x));
        }
 
        regamma_params->hw_points_num = hw_points;

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c
index e98ed30..9b65b77 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c
@@ -175,7 +175,7 @@ static void regamma_config_regions_and_segments(
                value = 0;
                set_reg_field_value(
                        value,
-                       params->arr_points[2].custom_float_slope,
+                       params->arr_points[1].custom_float_slope,
                        GAMMA_CORR_CNTLA_END_CNTL2,
                        GAMMA_CORR_CNTLA_EXP_REGION_END_BASE);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 666c6c0..c4a6ad3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -1158,8 +1158,6 @@ static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
                        dal_fixed31_32_from_int(segment_start));
        arr_points[1].x = dal_fixed31_32_pow(dal_fixed31_32_from_int(2),
                        dal_fixed31_32_from_int(segment_end));
-       arr_points[2].x = dal_fixed31_32_pow(dal_fixed31_32_from_int(2),
-                       dal_fixed31_32_from_int(segment_end));
 
        y_r = rgb_resulted[0].red;
        y_g = rgb_resulted[0].green;
@@ -1181,10 +1179,8 @@ static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
        y3_max = dal_fixed31_32_max(y_r, dal_fixed31_32_max(y_g, y_b));
 
        arr_points[1].y = y3_max;
-       arr_points[2].y = y3_max;
 
        arr_points[1].slope = dal_fixed31_32_zero;
-       arr_points[2].slope = dal_fixed31_32_zero;
 
        if (output_tf->tf == TRANSFER_FUNCTION_PQ) {
                /* for PQ, we want to have a straight line from last HW X point,
@@ -1196,9 +1192,6 @@ static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
                arr_points[1].slope = dal_fixed31_32_div(
                        dal_fixed31_32_sub(dal_fixed31_32_one, arr_points[1].y),
                        dal_fixed31_32_sub(end_value, arr_points[1].x));
-               arr_points[2].slope = dal_fixed31_32_div(
-                       dal_fixed31_32_sub(dal_fixed31_32_one, arr_points[1].y),
-                       dal_fixed31_32_sub(end_value, arr_points[1].x));
        }
 
        regamma_params->hw_points_num = hw_points;

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
index fa3d100..a650ede 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
@@ -73,7 +73,7 @@ struct pwl_result_data {
 
 struct pwl_params {
        struct gamma_curve arr_curve_points[34];
-       struct curve_points arr_points[3];
+       struct curve_points arr_points[2];
        struct pwl_result_data rgb_resulted[256 + 3];
        uint32_t hw_points_num;
 };