[Intel-gfx] [PATCH 6/6] drm/i915: Turn HAS_FPGA_DBG_UNCLAIMED into a device_info flag

[Daniel Vetter]

On Tue, Apr 23, 2013 at 10:29:43AM +0300, Jani Nikula wrote:
> 
> I think this could be squashed together with the previous patch, but
> either way,
> 
> Reviewed-by: Jani Nikula <jani.nikula at intel.com>

Entire series merged to dinq, thanks.
-Daniel

> 
> On Mon, 22 Apr 2013, Damien Lespiau <damien.lespiau at intel.com> wrote:
> > Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.c | 2 ++
> >  drivers/gpu/drm/i915/i915_drv.h | 5 +++--
> >  2 files changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index 896b904..624cdfc 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -309,6 +309,7 @@ static const struct intel_device_info intel_haswell_d_info = {
> >  	GEN7_FEATURES,
> >  	.is_haswell = 1,
> >  	.has_ddi = 1,
> > +	.has_fpga_dbg = 1,
> >  };
> >  
> >  static const struct intel_device_info intel_haswell_m_info = {
> > @@ -316,6 +317,7 @@ static const struct intel_device_info intel_haswell_m_info = {
> >  	.is_haswell = 1,
> >  	.is_mobile = 1,
> >  	.has_ddi = 1,
> > +	.has_fpga_dbg = 1,
> >  };
> >  
> >  static const struct pci_device_id pciidlist[] = {		/* aka */
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index c5f0778..0eb4618 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -358,7 +358,8 @@ struct drm_i915_gt_funcs {
> >  	func(has_bsd_ring) sep \
> >  	func(has_blt_ring) sep \
> >  	func(has_llc) sep \
> > -	func(has_ddi)
> > +	func(has_ddi) sep \
> > +	func(has_fpga_dbg)
> >  
> >  #define DEFINE_FLAG(name) u8 name:1
> >  #define SEP_SEMICOLON ;
> > @@ -1369,7 +1370,7 @@ struct drm_i915_file_private {
> >  
> >  #define HAS_DDI(dev)		(INTEL_INFO(dev)->has_ddi)
> >  #define HAS_POWER_WELL(dev)	(IS_HASWELL(dev))
> > -#define HAS_FPGA_DBG_UNCLAIMED(dev)	(IS_HASWELL(dev))
> > +#define HAS_FPGA_DBG_UNCLAIMED(dev)	(INTEL_INFO(dev)->has_fpga_dbg)
> >  
> >  #define INTEL_PCH_DEVICE_ID_MASK		0xff00
> >  #define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00
> > -- 
> > 1.8.1.4
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch