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

[Jani Nikula]

On Mon, 02 Oct 2017, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> On Mon, Oct 02, 2017 at 01:02:28PM +0000, Jani Nikula wrote:
>> On Thu, 28 Sep 2017, Rodrigo Vivi <rodrigo.vivi at intel.com> 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.
>> >
>> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
>> > ---
>> >  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 9b54aafa2a0b..10537dcdd9c1 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 \
>> > @@ -495,7 +497,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
>> 
>> Please add he comma at the end.
>> 
>> >  };
>> >  
>> >  #define KBL_PLATFORM \
>> > @@ -543,7 +545,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
>
> this one here doesn't compile. it is inside a define...
>
> So, I have a:
> "v2: Add comma at the end (Jani), when possible." here

Oops, yeah, only when applicable. :)

BR,
Jani.


>
> but I'm not sure about that since comma here is not really needed, also it wasn't there with the .color
> and it is not symmetric anymore...
>
>> 
>> Ditto.
>> 
>> BR,
>> Jani.
>> 
>> >  
>> >  static const struct intel_device_info intel_cannonlake_gt2_info __initconst = {
>> >  	GEN10_FEATURES,
>> 
>> -- 
>> Jani Nikula, Intel Open Source Technology Center

-- 
Jani Nikula, Intel Open Source Technology Center