Revert "drm/i915: Enable full PPGTT on gen7"
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 22 Oct 2014 09:18:51 +0000 (11:18 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 24 Oct 2014 14:30:14 +0000 (16:30 +0200)
This reverts commit 8c50f10d73b50139dcfe48bc22f2c8c7822c1983.

It's not yet solid and Dave objected to pulling the tree in its
current state.

Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
References: http://mid.mail-archive.com/CAPM=9ty2r1MLE=wzC-_vNSUzXVqAyXiGgocpSV9qOp0gzpK3xA@mail.gmail.com
References: http://lists.freedesktop.org/archives/intel-gfx/2014-October/053926.html
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_gem_gtt.c

index 273dad964e1b3c195ad09230790c79af84fcd212..8ddc834f722f4bf89410cc9a1292fdf9f8125929 100644 (file)
@@ -67,7 +67,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
                return 0;
        }
 
-       return has_full_ppgtt ? 2 : has_aliasing_ppgtt ? 1 : 0;
+       return has_aliasing_ppgtt ? 1 : 0;
 }