---

yaml --- r: 307011 b: refs/heads/master c: 23f54be h: refs/heads/master i: 307009: 0047756 307007: 19bf927 v: v3
git-mirror · Mar 28, 2012 · 7ee69a1 · 7ee69a1
1 parent f13fe1b
commit 7ee69a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;