drm/i915/color: move check of gamma_enable to specific func/platform

Moved common code to check gamma_enable to specific funcs per platform
in bit_precision func. icl doesn't support that and chv has separate
enable knob for CGM LUT.

v2:
-Simplified chv_gamma_precision() [Ville]

Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191009065542.27415-3-swati2.sharma@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index 08d020d4da351ebc8a46e4bac0357ce60dc53bf2..fa44eb73d088d64a9554b92d8fe06214e0c401ff 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -1420,6 +1420,9 @@ static int icl_color_check(struct intel_crtc_state *crtc_state)
 
 static int i9xx_gamma_precision(const struct intel_crtc_state *crtc_state)
 {
+       if (!crtc_state->gamma_enable)
+               return 0;
+
        switch (crtc_state->gamma_mode) {
        case GAMMA_MODE_MODE_8BIT:
                return 8;
@@ -1433,6 +1436,9 @@ static int i9xx_gamma_precision(const struct intel_crtc_state *crtc_state)
 
 static int ilk_gamma_precision(const struct intel_crtc_state *crtc_state)
 {
+       if (!crtc_state->gamma_enable)
+               return 0;
+
        if ((crtc_state->csc_mode & CSC_POSITION_BEFORE_GAMMA) == 0)
                return 0;
 
@@ -1457,6 +1463,9 @@ static int chv_gamma_precision(const struct intel_crtc_state *crtc_state)
 
 static int glk_gamma_precision(const struct intel_crtc_state *crtc_state)
 {
+       if (!crtc_state->gamma_enable)
+               return 0;
+
        switch (crtc_state->gamma_mode) {
        case GAMMA_MODE_MODE_8BIT:
                return 8;
@@ -1473,9 +1482,6 @@ int intel_color_get_gamma_bit_precision(const struct intel_crtc_state *crtc_stat
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 
-       if (!crtc_state->gamma_enable)
-               return 0;
-
        if (HAS_GMCH(dev_priv)) {
                if (IS_CHERRYVIEW(dev_priv))
                        return chv_gamma_precision(crtc_state);