From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com>
Date: Tue, 30 Jan 2018 11:14:27 -0500
Subject: drm/amd/display: Refactor max color lut entries into a macro.
Git-commit: 236d0e4f6f1eaac500261660e35ededcfbd66eeb
Patch-mainline: v4.17-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-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/amdgpu_dm/amdgpu_dm.c | 5 +++--
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 ++
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 11 +++++------
3 files changed, 10 insertions(+), 8 deletions(-)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3230,8 +3230,9 @@ static int amdgpu_dm_crtc_init(struct am
acrtc->base.enabled = false;
dm->adev->mode_info.crtcs[crtc_index] = acrtc;
- drm_crtc_enable_color_mgmt(&acrtc->base, 256, true, 256);
- drm_mode_crtc_set_gamma_size(&acrtc->base, 256);
+ drm_crtc_enable_color_mgmt(&acrtc->base, MAX_COLOR_LUT_ENTRIES,
+ true, MAX_COLOR_LUT_ENTRIES);
+ drm_mode_crtc_set_gamma_size(&acrtc->base, MAX_COLOR_LUT_ENTRIES);
return 0;
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -268,6 +268,8 @@ void amdgpu_dm_crtc_handle_crc_irq(struc
#define amdgpu_dm_crtc_handle_crc_irq(x)
#endif
+#define MAX_COLOR_LUT_ENTRIES 256
+
void amdgpu_dm_init_color_mod(void);
int amdgpu_dm_set_degamma_lut(struct drm_crtc_state *crtc_state,
struct dc_plane_state *dc_plane_state);
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -39,14 +39,13 @@ void amdgpu_dm_init_color_mod(void)
}
-#define MAX_LUT_ENTRIES 256
-
/*
* Return true if the given lut is a linear mapping of values, i.e. it acts
* like a bypass LUT.
*
* It is considered linear if the lut represents:
- * f(a) = (0xFF00/MAX_LUT_ENTRIES-1)a; for integer a in [0, MAX_LUT_ENTRIES)
+ * f(a) = (0xFF00/MAX_COLOR_LUT_ENTRIES-1)a; for integer a in
+ * [0, MAX_COLOR_LUT_ENTRIES)
*/
static bool __is_lut_linear(struct drm_color_lut *lut)
{
@@ -55,12 +54,12 @@ static bool __is_lut_linear(struct drm_c
uint32_t expected;
int delta;
- for (i = 0; i < MAX_LUT_ENTRIES; i++) {
+ for (i = 0; i < MAX_COLOR_LUT_ENTRIES; i++) {
/* All color values should equal */
if ((lut[i].red != lut[i].green) || (lut[i].green != lut[i].blue))
return false;
- expected = i * max_os / (MAX_LUT_ENTRIES-1);
+ expected = i * max_os / (MAX_COLOR_LUT_ENTRIES-1);
/* Allow a +/-1 error. */
delta = lut[i].red - expected;
@@ -113,7 +112,7 @@ int amdgpu_dm_set_regamma_lut(struct dm_
if (!gamma)
return -ENOMEM;
- gamma->num_entries = MAX_LUT_ENTRIES;
+ gamma->num_entries = MAX_COLOR_LUT_ENTRIES;
gamma->type = GAMMA_RGB_256;
/* Truncate, and store in dc_gamma for output tf calculation */