[Intel-gfx] [PATCH 02/15] drm/i915/glk: Introduce Geminilake platform definition

[Ander Conselvan De Oliveira]

On Thu, 2016-11-10 at 09:03 -0800, Rodrigo Vivi wrote:
> Yep, it is probably better to merge Jani patch before while no platform
> is using that flag, but one way or another feel free to use:

Agreed. I'll send an updated version of the first two patches because of the
ddb_size that is wrong, so I can rebase while at it.

Ander

> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> 
> On Thu, Nov 10, 2016 at 06:40:29PM +0200, Jani Nikula wrote:
> > 
> > On Thu, 10 Nov 2016, Ander Conselvan de Oliveira <ander.conselvan.de.oliveir
> > a at intel.com> wrote:
> > > 
> > > Geminilake is an Intel® Processor containing Intel® HD Graphics
> > > following Broxton.
> > > 
> > > Let's start by adding the platform definition. PCI IDs and plaform
> > > specific code will follow.
> > > 
> > > v2: Rebase (don't allow dev to be used with the new macro).
> > > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at in
> > > tel.com>
> > > ---
> > >  drivers/gpu/drm/i915/i915_drv.h | 2 ++
> > >  drivers/gpu/drm/i915/i915_pci.c | 6 ++++++
> > >  2 files changed, 8 insertions(+)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/i915_drv.h
> > > b/drivers/gpu/drm/i915/i915_drv.h
> > > index 4735b417..8a99e6e 100644
> > > --- a/drivers/gpu/drm/i915/i915_drv.h
> > > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > > @@ -667,6 +667,7 @@ struct intel_csr {
> > >  	func(is_broadwell); \
> > >  	func(is_skylake); \
> > >  	func(is_broxton); \
> > > +	func(is_geminilake); \
> > >  	func(is_kabylake); \
> > >  	func(is_preliminary); \
> > >  	/* Keep has_* in alphabetical order */ \
> > > @@ -2756,6 +2757,7 @@ struct drm_i915_cmd_table {
> > >  #define IS_BROADWELL(dev_priv)	((dev_priv)->info.is_broadwell)
> > >  #define IS_SKYLAKE(dev_priv)	((dev_priv)->info.is_skylake)
> > >  #define IS_BROXTON(dev_priv)	((dev_priv)->info.is_broxton)
> > > +#define IS_GEMINILAKE(dev_priv)	((dev_priv)->info.is_geminilake)
> > >  #define IS_KABYLAKE(dev_priv)	((dev_priv)->info.is_kabylake)
> > >  #define IS_MOBILE(dev_priv)	((dev_priv)->info.is_mobile)
> > >  #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \
> > > diff --git a/drivers/gpu/drm/i915/i915_pci.c
> > > b/drivers/gpu/drm/i915/i915_pci.c
> > > index b8cdda1..dc2ba3f 100644
> > > --- a/drivers/gpu/drm/i915/i915_pci.c
> > > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > > @@ -372,6 +372,12 @@ static const struct intel_device_info
> > > intel_broxton_info = {
> > >  	GEN9_LP_FEATURES,
> > >  };
> > >  
> > > +static const struct intel_device_info intel_geminilake_info = {
> > > +	.is_preliminary = 1,
> > I'd like to push [1] pretty soon now that Daniel gave his reviewed-by,
> > and we currently don't have anything in preliminary, until these patches
> > get merged. If you need to resend the series again for some other
> > reason, let me know so I'll push that first and you can rebase this
> > patch; it's rather trivial. Otherwise, I'll rebase my patch on top of
> > this series once it's been pushed. Sound okay?
> > 
> > BR
> > Jani.
> > 
> > 
> > [1] http://patchwork.freedesktop.org/patch/msgid/1477909108-18696-1-git-send
> > -email-jani.nikula at intel.com
> > 
> > 
> > > 
> > > +	.is_geminilake = 1,
> > > +	GEN9_LP_FEATURES,
> > > +};
> > > +
> > >  static const struct intel_device_info intel_kabylake_info = {
> > >  	BDW_FEATURES,
> > >  	.is_kabylake = 1,