From: Michel Thierry Date: Fri, 5 Sep 2014 13:13:16 +0000 (+0100) Subject: drm/i915: Enable full PPGTT on gen7 X-Git-Tag: v3.19-rc1~73^2~79^2~75 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8c50f10d73b50139dcfe48bc22f2c8c7822c1983;p=~emulex%2Finfiniband.git drm/i915: Enable full PPGTT on gen7 Use full PPGTT as the default option in gen7. Note that aliasing PPGTT is the default option for gen8 (see HAS_PPGTT) since we're still fighting troubles around context switching and execlists. This may well come back to bite me later. Signed-off-by: Michel Thierry [danvet: Explain that gen8 full ppgtt is blocked on execlists for now.] Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 6f410cfb051..14f078c6cb7 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -59,7 +59,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) return 0; } - return HAS_ALIASING_PPGTT(dev) ? 1 : 0; + return HAS_PPGTT(dev) ? 2 : HAS_ALIASING_PPGTT(dev) ? 1 : 0; }