On Thu, May 29, 2014 at 02:33:21PM -0700, Jesse Barnes wrote: > Working for real this time. i915_ppgtt_info has all sorts of good stuff > in it and X is running nicely on top. > > Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Maintainer-nitpick: Please don't forget the patch changelog ... -Daniel > --- > drivers/gpu/drm/i915/i915_drv.h | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index bea9ab40..8631fb3 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1936,10 +1936,8 @@ struct drm_i915_cmd_table { > #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws) > > #define HAS_HW_CONTEXTS(dev) (INTEL_INFO(dev)->gen >= 6) > -#define HAS_ALIASING_PPGTT(dev) (INTEL_INFO(dev)->gen >= 6 && \ > - (!IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))) > -#define HAS_PPGTT(dev) (INTEL_INFO(dev)->gen >= 7 \ > - && !IS_GEN8(dev)) > +#define HAS_ALIASING_PPGTT(dev) (INTEL_INFO(dev)->gen >= 6) > +#define HAS_PPGTT(dev) (INTEL_INFO(dev)->gen >= 7 && !IS_GEN8(dev)) > #define USES_PPGTT(dev) intel_enable_ppgtt(dev, false) > #define USES_FULL_PPGTT(dev) intel_enable_ppgtt(dev, true) > > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx