]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/display: Add gamma precision function for CHV
authorSwati Sharma <swati2.sharma@intel.com>
Mon, 9 Sep 2019 12:01:41 +0000 (17:31 +0530)
committerJani Nikula <jani.nikula@intel.com>
Tue, 10 Sep 2019 10:23:26 +0000 (13:23 +0300)
intel_color_get_gamma_bit_precision() is extended for
cherryview by adding chv_gamma_precision(), i965 will use existing
i9xx_gamma_precision() func only.

Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1568030503-26747-2-git-send-email-swati2.sharma@intel.com
drivers/gpu/drm/i915/display/intel_color.c

index 6d641e15989939eb388da7269b8620a1fc893ab7..4d9a5686a4d7993bf7253a8da24d4c36f16ad925 100644 (file)
@@ -1400,6 +1400,14 @@ static int ilk_gamma_precision(const struct intel_crtc_state *crtc_state)
        }
 }
 
+static int chv_gamma_precision(const struct intel_crtc_state *crtc_state)
+{
+       if (crtc_state->cgm_mode & CGM_PIPE_MODE_GAMMA)
+               return 10;
+       else
+               return i9xx_gamma_precision(crtc_state);
+}
+
 static int glk_gamma_precision(const struct intel_crtc_state *crtc_state)
 {
        switch (crtc_state->gamma_mode) {
@@ -1421,12 +1429,17 @@ int intel_color_get_gamma_bit_precision(const struct intel_crtc_state *crtc_stat
        if (!crtc_state->gamma_enable)
                return 0;
 
-       if (HAS_GMCH(dev_priv) && !IS_CHERRYVIEW(dev_priv))
-               return i9xx_gamma_precision(crtc_state);
-       else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
-               return glk_gamma_precision(crtc_state);
-       else if (IS_IRONLAKE(dev_priv))
-               return ilk_gamma_precision(crtc_state);
+       if (HAS_GMCH(dev_priv)) {
+               if (IS_CHERRYVIEW(dev_priv))
+                       return chv_gamma_precision(crtc_state);
+               else
+                       return i9xx_gamma_precision(crtc_state);
+       } else {
+               if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
+                       return glk_gamma_precision(crtc_state);
+               else if (IS_IRONLAKE(dev_priv))
+                       return ilk_gamma_precision(crtc_state);
+       }
 
        return 0;
 }