drm/amd/display: A few more color indentation changes

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_ipp.c b/drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c
index d618fdd..d737e91 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c
@@ -135,36 +135,34 @@ static void dce_ipp_cursor_set_attributes(
 }
 
 
-static void dce_ipp_program_prescale(
-       struct input_pixel_processor *ipp,
-       struct ipp_prescale_params *params)
+static void dce_ipp_program_prescale(struct input_pixel_processor *ipp,
+                                    struct ipp_prescale_params *params)
 {
        struct dce_ipp *ipp_dce = TO_DCE_IPP(ipp);
 
        /* set to bypass mode first before change */
        REG_UPDATE(PRESCALE_GRPH_CONTROL,
-               GRPH_PRESCALE_BYPASS,
-               1);
+                  GRPH_PRESCALE_BYPASS, 1);
 
        REG_SET_2(PRESCALE_VALUES_GRPH_R, 0,
-               GRPH_PRESCALE_SCALE_R, params->scale,
-               GRPH_PRESCALE_BIAS_R, params->bias);
+                 GRPH_PRESCALE_SCALE_R, params->scale,
+                 GRPH_PRESCALE_BIAS_R, params->bias);
 
        REG_SET_2(PRESCALE_VALUES_GRPH_G, 0,
-               GRPH_PRESCALE_SCALE_G, params->scale,
-               GRPH_PRESCALE_BIAS_G, params->bias);
+                 GRPH_PRESCALE_SCALE_G, params->scale,
+                 GRPH_PRESCALE_BIAS_G, params->bias);
 
        REG_SET_2(PRESCALE_VALUES_GRPH_B, 0,
-               GRPH_PRESCALE_SCALE_B, params->scale,
-               GRPH_PRESCALE_BIAS_B, params->bias);
+                 GRPH_PRESCALE_SCALE_B, params->scale,
+                 GRPH_PRESCALE_BIAS_B, params->bias);
 
        if (params->mode != IPP_PRESCALE_MODE_BYPASS) {
                REG_UPDATE(PRESCALE_GRPH_CONTROL,
-                               GRPH_PRESCALE_BYPASS, 0);
+                          GRPH_PRESCALE_BYPASS, 0);
 
                /* If prescale is in use, then legacy lut should be bypassed */
                REG_UPDATE(INPUT_GAMMA_CONTROL,
-                               GRPH_INPUT_GAMMA_MODE, 1);
+                          GRPH_INPUT_GAMMA_MODE, 1);
        }
 }
 
@@ -223,13 +221,12 @@ static void dce_ipp_set_degamma(
        struct dce_ipp *ipp_dce = TO_DCE_IPP(ipp);
        uint32_t degamma_type = (mode == IPP_DEGAMMA_MODE_HW_sRGB) ? 1 : 0;
 
-       ASSERT(mode == IPP_DEGAMMA_MODE_BYPASS ||
-                       mode == IPP_DEGAMMA_MODE_HW_sRGB);
+       ASSERT(mode == IPP_DEGAMMA_MODE_BYPASS || mode == IPP_DEGAMMA_MODE_HW_sRGB);
 
        REG_SET_3(DEGAMMA_CONTROL, 0,
-               GRPH_DEGAMMA_MODE, degamma_type,
-               CURSOR_DEGAMMA_MODE, degamma_type,
-               CURSOR2_DEGAMMA_MODE, degamma_type);
+                 GRPH_DEGAMMA_MODE, degamma_type,
+                 CURSOR_DEGAMMA_MODE, degamma_type,
+                 CURSOR2_DEGAMMA_MODE, degamma_type);
 }
 
 static const struct ipp_funcs dce_ipp_funcs = {

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 330dbe9..0f662e6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
@@ -1177,9 +1177,8 @@ void dce110_opp_set_csc_default(
                default_adjust->out_color_space);
 }
 
-static void program_pwl(
-       struct dce_transform *xfm_dce,
-       const struct pwl_params *params)
+static void program_pwl(struct dce_transform *xfm_dce,
+                       const struct pwl_params *params)
 {
        int retval;
        uint8_t max_tries = 10;

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 97630fc..4f32150 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
@@ -307,10 +307,9 @@ dce110_set_input_transfer_func(struct pipe_ctx *pipe_ctx,
        return result;
 }
 
-static bool convert_to_custom_float(
-               struct pwl_result_data *rgb_resulted,
-               struct curve_points *arr_points,
-               uint32_t hw_points_num)
+static bool convert_to_custom_float(struct pwl_result_data *rgb_resulted,
+                                   struct curve_points *arr_points,
+                                   uint32_t hw_points_num)
 {
        struct custom_float_format fmt;
 
@@ -322,26 +321,20 @@ static bool convert_to_custom_float(
        fmt.mantissa_bits = 12;
        fmt.sign = true;
 
-       if (!convert_to_custom_float_format(
-               arr_points[0].x,
-               &fmt,
-               &arr_points[0].custom_float_x)) {
+       if (!convert_to_custom_float_format(arr_points[0].x, &fmt,
+                                           &arr_points[0].custom_float_x)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
 
-       if (!convert_to_custom_float_format(
-               arr_points[0].offset,
-               &fmt,
-               &arr_points[0].custom_float_offset)) {
+       if (!convert_to_custom_float_format(arr_points[0].offset, &fmt,
+                                           &arr_points[0].custom_float_offset)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
 
-       if (!convert_to_custom_float_format(
-               arr_points[0].slope,
-               &fmt,
-               &arr_points[0].custom_float_slope)) {
+       if (!convert_to_custom_float_format(arr_points[0].slope, &fmt,
+                                           &arr_points[0].custom_float_slope)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
@@ -349,26 +342,20 @@ static bool convert_to_custom_float(
        fmt.mantissa_bits = 10;
        fmt.sign = false;
 
-       if (!convert_to_custom_float_format(
-               arr_points[1].x,
-               &fmt,
-               &arr_points[1].custom_float_x)) {
+       if (!convert_to_custom_float_format(arr_points[1].x, &fmt,
+                                           &arr_points[1].custom_float_x)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
 
-       if (!convert_to_custom_float_format(
-               arr_points[1].y,
-               &fmt,
-               &arr_points[1].custom_float_y)) {
+       if (!convert_to_custom_float_format(arr_points[1].y, &fmt,
+                                           &arr_points[1].custom_float_y)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
 
-       if (!convert_to_custom_float_format(
-               arr_points[2].slope,
-               &fmt,
-               &arr_points[2].custom_float_slope)) {
+       if (!convert_to_custom_float_format(arr_points[2].slope, &fmt,
+                                           &arr_points[2].custom_float_slope)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
@@ -377,50 +364,38 @@ static bool convert_to_custom_float(
        fmt.sign = true;
 
        while (i != hw_points_num) {
-               if (!convert_to_custom_float_format(
-                       rgb->red,
-                       &fmt,
-                       &rgb->red_reg)) {
+               if (!convert_to_custom_float_format(rgb->red, &fmt,
+                                                   &rgb->red_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->green,
-                       &fmt,
-                       &rgb->green_reg)) {
+               if (!convert_to_custom_float_format(rgb->green, &fmt,
+                                                   &rgb->green_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->blue,
-                       &fmt,
-                       &rgb->blue_reg)) {
+               if (!convert_to_custom_float_format(rgb->blue, &fmt,
+                                                   &rgb->blue_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->delta_red,
-                       &fmt,
-                       &rgb->delta_red_reg)) {
+               if (!convert_to_custom_float_format(rgb->delta_red, &fmt,
+                                                   &rgb->delta_red_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->delta_green,
-                       &fmt,
-                       &rgb->delta_green_reg)) {
+               if (!convert_to_custom_float_format(rgb->delta_green, &fmt,
+                                                   &rgb->delta_green_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->delta_blue,
-                       &fmt,
-                       &rgb->delta_blue_reg)) {
+               if (!convert_to_custom_float_format(rgb->delta_blue, &fmt,
+                                                   &rgb->delta_blue_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
index d8929b3..8df3945 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
@@ -213,8 +213,8 @@ static void dpp1_cm_set_regamma_pwl(
                else
                        dpp1_cm_program_regamma_lutb_settings(dpp_base, params);
 
-               dpp1_cm_program_regamma_lut(
-                               dpp_base, params->rgb_resulted, params->hw_points_num);
+               dpp1_cm_program_regamma_lut(dpp_base, params->rgb_resulted,
+                                           params->hw_points_num);
                dpp->pwl_data = *params;
 
                re_mode = dpp->is_write_to_ram_a_safe ? 3 : 4;

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
index bb430c0..b4892f4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
@@ -365,34 +365,31 @@ void dpp1_cm_set_output_csc_adjustment(
        dpp1_cm_program_color_matrix(dpp, tbl_entry);
 }
 
-void dpp1_cm_power_on_regamma_lut(
-       struct dpp *dpp_base,
-       bool power_on)
+void dpp1_cm_power_on_regamma_lut(struct dpp *dpp_base,
+                                 bool power_on)
 {
        struct dcn10_dpp *dpp = TO_DCN10_DPP(dpp_base);
+
        REG_SET(CM_MEM_PWR_CTRL, 0,
-                       RGAM_MEM_PWR_FORCE, power_on == true ? 0:1);
+               RGAM_MEM_PWR_FORCE, power_on == true ? 0:1);
 
 }
 
-void dpp1_cm_program_regamma_lut(
-               struct dpp *dpp_base,
-               const struct pwl_result_data *rgb,
-               uint32_t num)
+void dpp1_cm_program_regamma_lut(struct dpp *dpp_base,
+                                const struct pwl_result_data *rgb,
+                                uint32_t num)
 {
        uint32_t i;
        struct dcn10_dpp *dpp = TO_DCN10_DPP(dpp_base);
+
        for (i = 0 ; i < num; i++) {
                REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].red_reg);
                REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].green_reg);
                REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].blue_reg);
 
-               REG_SET(CM_RGAM_LUT_DATA, 0,
-                               CM_RGAM_LUT_DATA, rgb[i].delta_red_reg);
-               REG_SET(CM_RGAM_LUT_DATA, 0,
-                               CM_RGAM_LUT_DATA, rgb[i].delta_green_reg);
-               REG_SET(CM_RGAM_LUT_DATA, 0,
-                               CM_RGAM_LUT_DATA, rgb[i].delta_blue_reg);
+               REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].delta_red_reg);
+               REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].delta_green_reg);
+               REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].delta_blue_reg);
 
        }
 

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 c4a6ad3..cb73d25 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
@@ -953,26 +953,20 @@ static bool convert_to_custom_float(
        fmt.mantissa_bits = 12;
        fmt.sign = false;
 
-       if (!convert_to_custom_float_format(
-               arr_points[0].x,
-               &fmt,
-               &arr_points[0].custom_float_x)) {
+       if (!convert_to_custom_float_format(arr_points[0].x, &fmt,
+                                           &arr_points[0].custom_float_x)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
 
-       if (!convert_to_custom_float_format(
-               arr_points[0].offset,
-               &fmt,
-               &arr_points[0].custom_float_offset)) {
+       if (!convert_to_custom_float_format(arr_points[0].offset, &fmt,
+                                           &arr_points[0].custom_float_offset)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
 
-       if (!convert_to_custom_float_format(
-               arr_points[0].slope,
-               &fmt,
-               &arr_points[0].custom_float_slope)) {
+       if (!convert_to_custom_float_format(arr_points[0].slope, &fmt,
+                                           &arr_points[0].custom_float_slope)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
@@ -980,26 +974,20 @@ static bool convert_to_custom_float(
        fmt.mantissa_bits = 10;
        fmt.sign = false;
 
-       if (!convert_to_custom_float_format(
-               arr_points[1].x,
-               &fmt,
-               &arr_points[1].custom_float_x)) {
+       if (!convert_to_custom_float_format(arr_points[1].x, &fmt,
+                                           &arr_points[1].custom_float_x)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
 
-       if (!convert_to_custom_float_format(
-               arr_points[1].y,
-               &fmt,
-               &arr_points[1].custom_float_y)) {
+       if (!convert_to_custom_float_format(arr_points[1].y, &fmt,
+                                           &arr_points[1].custom_float_y)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
 
-       if (!convert_to_custom_float_format(
-               arr_points[1].slope,
-               &fmt,
-               &arr_points[1].custom_float_slope)) {
+       if (!convert_to_custom_float_format(arr_points[1].slope, &fmt,
+                                           &arr_points[1].custom_float_slope)) {
                BREAK_TO_DEBUGGER();
                return false;
        }
@@ -1008,50 +996,38 @@ static bool convert_to_custom_float(
        fmt.sign = true;
 
        while (i != hw_points_num) {
-               if (!convert_to_custom_float_format(
-                       rgb->red,
-                       &fmt,
-                       &rgb->red_reg)) {
+               if (!convert_to_custom_float_format(rgb->red, &fmt,
+                                                   &rgb->red_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->green,
-                       &fmt,
-                       &rgb->green_reg)) {
+               if (!convert_to_custom_float_format(rgb->green, &fmt,
+                                                   &rgb->green_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->blue,
-                       &fmt,
-                       &rgb->blue_reg)) {
+               if (!convert_to_custom_float_format(rgb->blue, &fmt,
+                                                   &rgb->blue_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->delta_red,
-                       &fmt,
-                       &rgb->delta_red_reg)) {
+               if (!convert_to_custom_float_format(rgb->delta_red, &fmt,
+                                                   &rgb->delta_red_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->delta_green,
-                       &fmt,
-                       &rgb->delta_green_reg)) {
+               if (!convert_to_custom_float_format(rgb->delta_green, &fmt,
+                                                   &rgb->delta_green_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
 
-               if (!convert_to_custom_float_format(
-                       rgb->delta_blue,
-                       &fmt,
-                       &rgb->delta_blue_reg)) {
+               if (!convert_to_custom_float_format(rgb->delta_blue, &fmt,
+                                                   &rgb->delta_blue_reg)) {
                        BREAK_TO_DEBUGGER();
                        return false;
                }
@@ -1066,8 +1042,9 @@ static bool convert_to_custom_float(
 #define MAX_LOW_POINT      25
 #define NUMBER_SEGMENTS    32
 
-static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
-               *output_tf, struct pwl_params *regamma_params)
+static bool
+dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func *output_tf,
+                                    struct pwl_params *regamma_params)
 {
        struct curve_points *arr_points;
        struct pwl_result_data *rgb_resulted;
@@ -1083,8 +1060,7 @@ static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
        int32_t i;
        uint32_t j, k, seg_distr[MAX_REGIONS_NUMBER], increment, start_index, hw_points;
 
-       if (output_tf == NULL || regamma_params == NULL ||
-                       output_tf->type == TF_TYPE_BYPASS)
+       if (output_tf == NULL || regamma_params == NULL || output_tf->type == TF_TYPE_BYPASS)
                return false;
 
        arr_points = regamma_params->arr_points;
@@ -1147,17 +1123,14 @@ static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
 
        /* last point */
        start_index = (segment_end + MAX_LOW_POINT) * NUMBER_SEGMENTS;
-       rgb_resulted[hw_points - 1].red =
-                       output_tf->tf_pts.red[start_index];
-       rgb_resulted[hw_points - 1].green =
-                       output_tf->tf_pts.green[start_index];
-       rgb_resulted[hw_points - 1].blue =
-                       output_tf->tf_pts.blue[start_index];
+       rgb_resulted[hw_points - 1].red = output_tf->tf_pts.red[start_index];
+       rgb_resulted[hw_points - 1].green = output_tf->tf_pts.green[start_index];
+       rgb_resulted[hw_points - 1].blue = output_tf->tf_pts.blue[start_index];
 
        arr_points[0].x = dal_fixed31_32_pow(dal_fixed31_32_from_int(2),
-                       dal_fixed31_32_from_int(segment_start));
+                                            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));
+                                            dal_fixed31_32_from_int(segment_end));
 
        y_r = rgb_resulted[0].red;
        y_g = rgb_resulted[0].green;
@@ -1166,9 +1139,7 @@ static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
        y1_min = dal_fixed31_32_min(y_r, dal_fixed31_32_min(y_g, y_b));
 
        arr_points[0].y = y1_min;
-       arr_points[0].slope = dal_fixed31_32_div(
-                                       arr_points[0].y,
-                                       arr_points[0].x);
+       arr_points[0].slope = dal_fixed31_32_div(arr_points[0].y, arr_points[0].x);
        y_r = rgb_resulted[hw_points - 1].red;
        y_g = rgb_resulted[hw_points - 1].green;
        y_b = rgb_resulted[hw_points - 1].blue;
@@ -1202,15 +1173,13 @@ static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
                        regamma_params->arr_curve_points[k].segments_num =
                                        seg_distr[k];
                        regamma_params->arr_curve_points[i].offset =
-                                       regamma_params->arr_curve_points[k].
-                                       offset + (1 << seg_distr[k]);
+                                       regamma_params->arr_curve_points[k].offset + (1 << seg_distr[k]);
                }
                i++;
        }
 
        if (seg_distr[k] != -1)
-               regamma_params->arr_curve_points[k].segments_num =
-                               seg_distr[k];
+               regamma_params->arr_curve_points[k].segments_num = seg_distr[k];
 
        rgb = rgb_resulted;
        rgb_plus_1 = rgb_resulted + 1;
@@ -1225,15 +1194,9 @@ static bool dcn10_translate_regamma_to_hw_format(const struct dc_transfer_func
                if (dal_fixed31_32_lt(rgb_plus_1->blue, rgb->blue))
                        rgb_plus_1->blue = rgb->blue;
 
-               rgb->delta_red = dal_fixed31_32_sub(
-                       rgb_plus_1->red,
-                       rgb->red);
-               rgb->delta_green = dal_fixed31_32_sub(
-                       rgb_plus_1->green,
-                       rgb->green);
-               rgb->delta_blue = dal_fixed31_32_sub(
-                       rgb_plus_1->blue,
-                       rgb->blue);
+               rgb->delta_red = dal_fixed31_32_sub(rgb_plus_1->red, rgb->red);
+               rgb->delta_green = dal_fixed31_32_sub(rgb_plus_1->green, rgb->green);
+               rgb->delta_blue = dal_fixed31_32_sub(rgb_plus_1->blue, rgb->blue);
 
                ++rgb_plus_1;
                ++rgb;