diff options
| author | Tony Cheng <tony.cheng@amd.com> | 2017-01-14 20:56:08 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:10:37 -0400 |
| commit | f33ad37feb12639e3b4015d27840395793107d7b (patch) | |
| tree | 41b7891649356eb5caced76ce012d67120ee8bbd | |
| parent | 5e701406ed446a79787feede65c81b8d3cfbdfb8 (diff) | |
| download | linux-stable-f33ad37feb12639e3b4015d27840395793107d7b.tar.gz linux-stable-f33ad37feb12639e3b4015d27840395793107d7b.tar.bz2 linux-stable-f33ad37feb12639e3b4015d27840395793107d7b.zip | |
drm/amd/display: remove calculate_adjustments in conversion.h
- these are moved to color module
Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/basics/conversion.c | 118 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/basics/conversion.h | 10 |
2 files changed, 0 insertions, 128 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/basics/conversion.c b/drivers/gpu/drm/amd/display/dc/basics/conversion.c index 5682fea2080d..a2e22ae12adb 100644 --- a/drivers/gpu/drm/amd/display/dc/basics/conversion.c +++ b/drivers/gpu/drm/amd/display/dc/basics/conversion.c @@ -103,124 +103,6 @@ void convert_float_matrix( } } -static void calculate_adjustments_common( - const struct fixed31_32 *ideal_matrix, - const struct dc_csc_adjustments *adjustments, - struct fixed31_32 *matrix) -{ - const struct fixed31_32 sin_hue = - dal_fixed31_32_sin(adjustments->hue); - const struct fixed31_32 cos_hue = - dal_fixed31_32_cos(adjustments->hue); - - const struct fixed31_32 multiplier = - dal_fixed31_32_mul( - adjustments->contrast, - adjustments->saturation); - - matrix[0] = dal_fixed31_32_mul( - ideal_matrix[0], - adjustments->contrast); - - matrix[1] = dal_fixed31_32_mul( - ideal_matrix[1], - adjustments->contrast); - - matrix[2] = dal_fixed31_32_mul( - ideal_matrix[2], - adjustments->contrast); - - matrix[4] = dal_fixed31_32_mul( - multiplier, - dal_fixed31_32_add( - dal_fixed31_32_mul( - ideal_matrix[8], - sin_hue), - dal_fixed31_32_mul( - ideal_matrix[4], - cos_hue))); - - matrix[5] = dal_fixed31_32_mul( - multiplier, - dal_fixed31_32_add( - dal_fixed31_32_mul( - ideal_matrix[9], - sin_hue), - dal_fixed31_32_mul( - ideal_matrix[5], - cos_hue))); - - matrix[6] = dal_fixed31_32_mul( - multiplier, - dal_fixed31_32_add( - dal_fixed31_32_mul( - ideal_matrix[10], - sin_hue), - dal_fixed31_32_mul( - ideal_matrix[6], - cos_hue))); - - matrix[7] = ideal_matrix[7]; - - matrix[8] = dal_fixed31_32_mul( - multiplier, - dal_fixed31_32_sub( - dal_fixed31_32_mul( - ideal_matrix[8], - cos_hue), - dal_fixed31_32_mul( - ideal_matrix[4], - sin_hue))); - - matrix[9] = dal_fixed31_32_mul( - multiplier, - dal_fixed31_32_sub( - dal_fixed31_32_mul( - ideal_matrix[9], - cos_hue), - dal_fixed31_32_mul( - ideal_matrix[5], - sin_hue))); - - matrix[10] = dal_fixed31_32_mul( - multiplier, - dal_fixed31_32_sub( - dal_fixed31_32_mul( - ideal_matrix[10], - cos_hue), - dal_fixed31_32_mul( - ideal_matrix[6], - sin_hue))); - - matrix[11] = ideal_matrix[11]; -} - -void calculate_adjustments( - const struct fixed31_32 *ideal_matrix, - const struct dc_csc_adjustments *adjustments, - struct fixed31_32 *matrix) -{ - calculate_adjustments_common(ideal_matrix, adjustments, matrix); - - matrix[3] = dal_fixed31_32_add( - ideal_matrix[3], - dal_fixed31_32_mul( - adjustments->brightness, - dal_fixed31_32_from_fraction(86, 100))); -} - -void calculate_adjustments_y_only( - const struct fixed31_32 *ideal_matrix, - const struct dc_csc_adjustments *adjustments, - struct fixed31_32 *matrix) -{ - calculate_adjustments_common(ideal_matrix, adjustments, matrix); - - matrix[3] = dal_fixed31_32_add( - ideal_matrix[3], - adjustments->brightness); -} - unsigned int log_2(unsigned int num) { unsigned int result = 0; diff --git a/drivers/gpu/drm/amd/display/dc/basics/conversion.h b/drivers/gpu/drm/amd/display/dc/basics/conversion.h index b7fe431a7952..189325f68cfd 100644 --- a/drivers/gpu/drm/amd/display/dc/basics/conversion.h +++ b/drivers/gpu/drm/amd/display/dc/basics/conversion.h @@ -38,16 +38,6 @@ void convert_float_matrix( struct fixed31_32 *flt, uint32_t buffer_size); -void calculate_adjustments( - const struct fixed31_32 *ideal_matrix, - const struct dc_csc_adjustments *adjustments, - struct fixed31_32 *matrix); - -void calculate_adjustments_y_only( - const struct fixed31_32 *ideal_matrix, - const struct dc_csc_adjustments *adjustments, - struct fixed31_32 *matrix); - unsigned int log_2(unsigned int num); #endif |