Re: [Intel-gfx] [PATCH 1/3] drm/i915/display: Add gamma precision function for CHV

[Jani Nikula]

On Fri, 06 Sep 2019, Swati Sharma  wrote:
> 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 

Could be part of patch 3/3, but no big deal,

Reviewed-by: Jani Nikula 

> ---
>  drivers/gpu/drm/i915/display/intel_color.c | 25 +++--
>  1 file changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_color.c 
> b/drivers/gpu/drm/i915/display/intel_color.c
> index 6d641e1..4d9a568 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -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;
>  }

-- 
Jani Nikula, Intel Open Source Graphics Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 1/3] drm/i915/display: Add gamma precision function for CHV

[Swati Sharma]

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 
---
 drivers/gpu/drm/i915/display/intel_color.c | 25 +++--
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_color.c 
b/drivers/gpu/drm/i915/display/intel_color.c
index 6d641e1..4d9a568 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -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;
 }
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx