summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAmy Zhang <Amy.Zhang@amd.com>2017-01-24 09:50:05 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 17:12:19 -0400
commit23ae4f8e59c926df806ba837b2a2040984077641 (patch)
tree6cd34118911dcda1ebf91c1e8217d20a5ae5e69e /drivers
parent954815153b4b1213237d389be15d5448f67154ff (diff)
downloadlinux-23ae4f8e59c926df806ba837b2a2040984077641.tar.bz2
drm/amd/display: Fix Warnings
- 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c24
1 files changed, 14 insertions, 10 deletions
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 ce56f23806bc..c3e0865f3148 100644
--- 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_hw_format(const struct dc_transfer_func
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_hw_format(const struct dc_transfer_func
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;