drm/i915: Fix GCMAX color register programming

GC MAX register is used to program values from 1.0 to
less than 3.0. A different register was used instead of
the intended one. Fixed the same.

Currently limiting it to 1.0 due to ABI limitations.

v2: Updated the 1.0 programming and aligned as per GLK, based
on Ville's feedback.

Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1553869756-4546-2-git-send-email-uma.shankar@intel.com

diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
index ff910ed0846824abc8ad5a13932143e328fd9127..c7761591ba7c1620e8d105f94b2435acd2b5525e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_color.c
+++ b/drivers/gpu/drm/i915/intel_color.c
@@ -518,14 +518,14 @@ static void bdw_load_gamma_lut(const struct intel_crtc_state *crtc_state, u32 of
                        I915_WRITE(PREC_PAL_DATA(pipe), word);
                }
 
-               /* Program the max register to clamp values > 1.0. */
-               i = lut_size - 1;
-               I915_WRITE(PREC_PAL_GC_MAX(pipe, 0),
-                          drm_color_lut_extract(lut[i].red, 16));
-               I915_WRITE(PREC_PAL_GC_MAX(pipe, 1),
-                          drm_color_lut_extract(lut[i].green, 16));
-               I915_WRITE(PREC_PAL_GC_MAX(pipe, 2),
-                          drm_color_lut_extract(lut[i].blue, 16));
+               /*
+                * Program the max register to clamp values > 1.0.
+                * ToDo: Extend the ABI to be able to program values
+                * from 1.0 to 3.0
+                */
+               I915_WRITE(PREC_PAL_EXT_GC_MAX(pipe, 0), (1 << 16));
+               I915_WRITE(PREC_PAL_EXT_GC_MAX(pipe, 1), (1 << 16));
+               I915_WRITE(PREC_PAL_EXT_GC_MAX(pipe, 2), (1 << 16));
        } else {
                for (i = 0; i < lut_size; i++) {
                        u32 v = (i * ((1 << 10) - 1)) / (lut_size - 1);
@@ -534,9 +534,9 @@ static void bdw_load_gamma_lut(const struct intel_crtc_state *crtc_state, u32 of
                                   (v << 20) | (v << 10) | v);
                }
 
-               I915_WRITE(PREC_PAL_GC_MAX(pipe, 0), (1 << 16) - 1);
-               I915_WRITE(PREC_PAL_GC_MAX(pipe, 1), (1 << 16) - 1);
-               I915_WRITE(PREC_PAL_GC_MAX(pipe, 2), (1 << 16) - 1);
+               I915_WRITE(PREC_PAL_EXT_GC_MAX(pipe, 0), (1 << 16));
+               I915_WRITE(PREC_PAL_EXT_GC_MAX(pipe, 1), (1 << 16));
+               I915_WRITE(PREC_PAL_EXT_GC_MAX(pipe, 2), (1 << 16));
        }
 
        /*