From 7ee69a15596fcbdea46353b8eeead840d2f86bdd Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 23 Mar 2012 17:38:49 +0000
Subject: [PATCH] --- yaml --- r: 307011 b: refs/heads/master c:
 23f54beafee1c31c7f0127650ec2903d80b3dfeb h: refs/heads/master i:   307009:
 0047756c37be9acce5462e838f21ab04da48cdae   307007:
 19bf927d5e71999637e9141d70d29c0c546afcd9 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a6f1bbd726c0..6283801fe6cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2c9677be3158c31ba19f527e2be0f7a519e19d1
+refs/heads/master: 23f54beafee1c31c7f0127650ec2903d80b3dfeb
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 4f690374fffe..a9caf62b5dd2 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -1923,6 +1923,8 @@ static void
 i915_mtrr_setup(struct drm_i915_private *dev_priv, unsigned long base,
 		unsigned long size)
 {
+	dev_priv->mm.gtt_mtrr = -1;
+
 #if defined(CONFIG_X86_PAT)
 	if (cpu_has_pat)
 		return;