Commit b310b081 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Bunch more color indentation cleanups 



Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Reviewed-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 97110c98

drivers/gpu/drm/amd/display/dc/dce/dce_transform.c

+49 −55
Original line number Diff line number Diff line
@@ -1183,10 +1183,10 @@ static void program_pwl( 
{

	uint32_t value;

	int retval;



	{

	uint8_t max_tries = 10;

	uint8_t counter = 0;

	uint32_t i = 0;

	const struct pwl_result_data *rgb = params->rgb_resulted;



	/* Power on LUT memory */

	if (REG(DCFE_MEM_PWR_CTRL))
@@ -1225,7 +1225,6 @@ static void program_pwl( 
				" programming still proceeds\n",

				__func__);

	}

	}



	REG_UPDATE(REGAMMA_LUT_WRITE_EN_MASK,

		   REGAMMA_LUT_WRITE_EN_MASK, 7);
@@ -1233,10 +1232,6 @@ static void program_pwl( 
	REG_WRITE(REGAMMA_LUT_INDEX, 0);



	/* Program REGAMMA_LUT_DATA */

	{

		uint32_t i = 0;

		const struct pwl_result_data *rgb = params->rgb_resulted;



	while (i != params->hw_points_num) {



		REG_WRITE(REGAMMA_LUT_DATA, rgb->red_reg);
@@ -1249,7 +1244,6 @@ static void program_pwl( 
		++rgb;

		++i;

	}

	}



	/*  we are done with DCP LUT memory; re-enable low power mode */

	if (REG(DCFE_MEM_PWR_CTRL))

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+20 −34
Original line number Diff line number Diff line
@@ -432,8 +432,9 @@ static bool convert_to_custom_float( 
	return true;

}



static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func

		*output_tf, struct pwl_params *regamma_params)

static bool

dce110_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;
@@ -448,8 +449,7 @@ static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func 
	int32_t segment_start, segment_end;

	uint32_t i, j, k, seg_distr[16], 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;
@@ -528,12 +528,9 @@ static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func 


	/* last point */

	start_index = (segment_end + 25) * 32;

	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));
@@ -547,8 +544,7 @@ static bool dce110_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].slope = dal_fixed31_32_div(arr_points[0].y,

						 arr_points[0].x);



	y_r = rgb_resulted[hw_points - 1].red;
@@ -568,8 +564,7 @@ static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func 
		/* for PQ, we want to have a straight line from last HW X point,

		 * and the slope to be such that we hit 1.0 at 10000 nits.

		 */

		const struct fixed31_32 end_value =

				dal_fixed31_32_from_int(125);

		const struct fixed31_32 end_value = dal_fixed31_32_from_int(125);



		arr_points[1].slope = dal_fixed31_32_div(

				dal_fixed31_32_sub(dal_fixed31_32_one, arr_points[1].y),
@@ -581,18 +576,15 @@ static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func 
	i = 1;

	for (k = 0; k < 16 && i < 16; k++) {

		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];

			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;
@@ -607,15 +599,9 @@ static bool dce110_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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE