[Intel-gfx] [PATCH 3/3] drm/i915: Organize GLK_COLORS.

[Rodrigo Vivi]

patches merged to dinq. Thanks for ideas, reviews and comments.

On Tue, Oct 03, 2017 at 06:36:52AM +0000, Rodrigo Vivi wrote:
> Let's organize this in a way that it gets more obvious
> when looking to the platform colors and in a easier
> way to get inherited.
> 
> v2: Add comma at the end (Jani), when possible.
> 
> Cc: Jani Nikula <jani.nikula at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/i915_pci.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index bfec3a7841d0..d3a6fe5e3c10 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -54,6 +54,8 @@
>  	.color = { .degamma_lut_size = 512, .gamma_lut_size = 512 }
>  #define CHV_COLORS \
>  	.color = { .degamma_lut_size = 65, .gamma_lut_size = 257 }
> +#define GLK_COLORS \
> +	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
>  
>  /* Keep in gen based order, and chronological order within a gen */
>  #define GEN2_FEATURES \
> @@ -496,7 +498,7 @@ static const struct intel_device_info intel_geminilake_info __initconst = {
>  	GEN9_LP_FEATURES,
>  	.platform = INTEL_GEMINILAKE,
>  	.ddb_size = 1024,
> -	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
> +	GLK_COLORS,
>  };
>  
>  #define KBL_PLATFORM \
> @@ -544,7 +546,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info __initconst = {
>  #define GEN10_FEATURES \
>  	GEN9_FEATURES, \
>  	.ddb_size = 1024, \
> -	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
> +	GLK_COLORS
>  
>  static const struct intel_device_info intel_cannonlake_gt2_info __initconst = {
>  	GEN10_FEATURES,
> -- 
> 2.13.5
>