From: Amy Zhang <Amy.Zhang@amd.com>
Date: Tue, 24 Jan 2017 09:50:05 -0500
Subject: drm/amd/display: Fix Warnings
Git-commit: 23ae4f8e59c926df806ba837b2a2040984077641
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

- Remove mixed declarations and unused variables

Signed-off-by: Amy Zhang <Amy.Zhang@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>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c |   24 +++++++-----
 1 file changed, 14 insertions(+), 10 deletions(-)

--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -581,12 +581,10 @@ static bool convert_to_custom_float(
 static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func
 		*output_tf, struct pwl_params *regamma_params)
 {
-	if (output_tf == NULL || regamma_params == NULL)
-		return false;
-
-	struct gamma_curve *arr_curve_points = regamma_params->arr_curve_points;
-	struct curve_points *arr_points = regamma_params->arr_points;
-	struct pwl_result_data *rgb_resulted = regamma_params->rgb_resulted;
+	struct curve_points *arr_points;
+	struct pwl_result_data *rgb_resulted;
+	struct pwl_result_data *rgb;
+	struct pwl_result_data *rgb_plus_1;
 	struct fixed31_32 y_r;
 	struct fixed31_32 y_g;
 	struct fixed31_32 y_b;
@@ -594,8 +592,14 @@ static bool dce110_translate_regamma_to_
 	struct fixed31_32 y3_max;
 
 	int32_t segment_start, segment_end;
-	uint32_t i, j, k, seg_distr[16], increment, start_index;
-	uint32_t hw_points = 0;
+	uint32_t i, j, k, seg_distr[16], increment, start_index, hw_points;
+
+	if (output_tf == NULL || regamma_params == NULL)
+		return false;
+
+	arr_points = regamma_params->arr_points;
+	rgb_resulted = regamma_params->rgb_resulted;
+	hw_points = 0;
 
 	memset(regamma_params, 0, sizeof(struct pwl_params));
 
@@ -742,8 +746,8 @@ static bool dce110_translate_regamma_to_
 		regamma_params->arr_curve_points[k].segments_num =
 				seg_distr[k];
 
-	struct pwl_result_data *rgb = rgb_resulted;
-	struct pwl_result_data *rgb_plus_1 = rgb_resulted + 1;
+	rgb = rgb_resulted;
+	rgb_plus_1 = rgb_resulted + 1;
 
 	i = 1;