[Intel-gfx] [PATCH] drm/i915: Convert a couple more INTEL_INFO-esque macros to be pointer agnostic

[Daniel Vetter]

On Fri, Oct 10, 2014 at 06:08:21PM +0300, Jani Nikula wrote:
> On Sun, 24 Aug 2014, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> > Just a couple more macros that assume that they were being passed a
> > struct drm_device when they want a struct drm_i915_private. Use our
> > magic macro to ease transitioning over to using drm_i915_privates
> >
> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> 
> Reviewed-by: Jani Nikula <jani.nikula at intel.com>

Queued for -next, thanks for the patch.
-Daniel

> 
> > ---
> >  drivers/gpu/drm/i915/i915_drv.h | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 5cadfa511d81..d1678e2747b3 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -2046,7 +2046,7 @@ struct drm_i915_cmd_table {
> >  #define HAS_VEBOX(dev)		(INTEL_INFO(dev)->ring_mask & VEBOX_RING)
> >  #define HAS_LLC(dev)		(INTEL_INFO(dev)->has_llc)
> >  #define HAS_WT(dev)		((IS_HASWELL(dev) || IS_BROADWELL(dev)) && \
> > -				 to_i915(dev)->ellc_size)
> > +				 __I915__(dev)->ellc_size)
> >  #define I915_NEED_GFX_HWS(dev)	(INTEL_INFO(dev)->need_gfx_hws)
> >  
> >  #define HAS_HW_CONTEXTS(dev)	(INTEL_INFO(dev)->gen >= 5)
> > @@ -2100,7 +2100,7 @@ struct drm_i915_cmd_table {
> >  #define INTEL_PCH_LPT_DEVICE_ID_TYPE		0x8c00
> >  #define INTEL_PCH_LPT_LP_DEVICE_ID_TYPE		0x9c00
> >  
> > -#define INTEL_PCH_TYPE(dev) (to_i915(dev)->pch_type)
> > +#define INTEL_PCH_TYPE(dev) (__I915__(dev)->pch_type)
> >  #define HAS_PCH_LPT(dev) (INTEL_PCH_TYPE(dev) == PCH_LPT)
> >  #define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)
> >  #define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX)
> > -- 
> > 2.1.0
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> 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