[Intel-gfx] [PATCH] drm/i915: Unify GT* and GT3 definitions

[Vivi, Rodrigo]

On Tue, 2017-06-06 at 10:47 +0300, Jani Nikula wrote:
> On Mon, 05 Jun 2017, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> > This patch clean up a bit the platform definition block in
> > a way to avoid duplications and to let clear that GT3 for
> > the current platform only have the extra Media engine.
> >
> > Cc: Anusha Srivatsa <anusha.srivatsa at intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_pci.c | 66 ++++++++++++++++++++---------------------
> >  1 file changed, 33 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> > index cf43dc1..e5a730f 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -312,17 +312,21 @@
> >  	.has_full_48bit_ppgtt = 1, \
> >  	.has_64bit_reloc = 1
> >  
> > +#define BDW_PLATFORM \
> > +	BDW_FEATURES, \
> > +	.gen = 8, \
> > +	.platform = INTEL_BROADWELL
> > +
> > +#define EXTRA_MEDIA_ENGINE \
> > +	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
> > +
> >  static const struct intel_device_info intel_broadwell_info = {
> > -	BDW_FEATURES,
> > -	.gen = 8,
> > -	.platform = INTEL_BROADWELL,
> > +	BDW_PLATFORM,
> >  };
> >  
> >  static const struct intel_device_info intel_broadwell_gt3_info = {
> > -	BDW_FEATURES,
> > -	.gen = 8,
> > -	.platform = INTEL_BROADWELL,
> > -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> > +	BDW_PLATFORM,
> > +	EXTRA_MEDIA_ENGINE,
> >  };
> >  
> >  static const struct intel_device_info intel_cherryview_info = {
> > @@ -347,23 +351,21 @@
> >  	CHV_COLORS,
> >  };
> >  
> > +#define SKL_PLATFORM \
> > +	BDW_FEATURES, \
> > +	.gen = 9, \
> > +	.platform = INTEL_SKYLAKE, \
> > +	.has_csr = 1, \
> > +	.has_guc = 1, \
> > +	.ddb_size = 896
> > +
> >  static const struct intel_device_info intel_skylake_info = {
> > -	BDW_FEATURES,
> > -	.platform = INTEL_SKYLAKE,
> > -	.gen = 9,
> > -	.has_csr = 1,
> > -	.has_guc = 1,
> > -	.ddb_size = 896,
> > +	SKL_PLATFORM,
> >  };
> >  
> >  static const struct intel_device_info intel_skylake_gt3_info = {
> > -	BDW_FEATURES,
> > -	.platform = INTEL_SKYLAKE,
> > -	.gen = 9,
> > -	.has_csr = 1,
> > -	.has_guc = 1,
> > -	.ddb_size = 896,
> > -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> > +	SKL_PLATFORM,
> > +	EXTRA_MEDIA_ENGINE,
> >  };
> >  
> >  #define GEN9_LP_FEATURES \
> > @@ -406,23 +408,21 @@
> >  	.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
> >  };
> >  
> > +#define KBL_PLATFORM \
> > +	BDW_FEATURES, \
> > +	.gen = 9, \
> > +	.platform = INTEL_SKYLAKE, \
> 
> Copy-paste fail that caught my eye. Didn't look at the patch closer.

yeap :(
Anusha also spotted that out so v2 was sent with the fix...
sorry about that...

> 
> BR,
> Jani.
> 
> > +	.has_csr = 1, \
> > +	.has_guc = 1, \
> > +	.ddb_size = 896
> > +
> >  static const struct intel_device_info intel_kabylake_info = {
> > -	BDW_FEATURES,
> > -	.platform = INTEL_KABYLAKE,
> > -	.gen = 9,
> > -	.has_csr = 1,
> > -	.has_guc = 1,
> > -	.ddb_size = 896,
> > +	KBL_PLATFORM,
> >  };
> >  
> >  static const struct intel_device_info intel_kabylake_gt3_info = {
> > -	BDW_FEATURES,
> > -	.platform = INTEL_KABYLAKE,
> > -	.gen = 9,
> > -	.has_csr = 1,
> > -	.has_guc = 1,
> > -	.ddb_size = 896,
> > -	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> > +	KBL_PLATFORM,
> > +	EXTRA_MEDIA_ENGINE,
> >  };
> >  
> >  /*
>