From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 22 Oct 2014 09:18:51 +0000 (+0200)
Subject: Revert "drm/i915: Enable full PPGTT on gen7"
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cacc6c837b799b058d59d2af02c11140640cc1d2;p=openwrt%2Fstaging%2Fblogic.git

Revert "drm/i915: Enable full PPGTT on gen7"

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>
---

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 273dad964e1b..8ddc834f722f 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -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;
 }