---

yaml --- r: 357931 b: refs/heads/master c: 8782e26 h: refs/heads/master i: 357929: 26bd7e6 357927: f9e3f07 v: v3
git-mirror · Dec 18, 2012 · b42987d · b42987d
1 parent 5688190
commit b42987d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dbf9d6e0fd8d42398955de119ccba6c35813c88
+refs/heads/master: 8782e26c0cf3444a0d11400277bb44de710a0142
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3897,8 +3897,10 @@ void i915_gem_init_swizzling(struct drm_device *dev)
 	I915_WRITE(TILECTL, I915_READ(TILECTL) | TILECTL_SWZCTL);
 	if (IS_GEN6(dev))
 		I915_WRITE(ARB_MODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_SNB));
-	else
+	else if (IS_GEN7(dev))
 		I915_WRITE(ARB_MODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_IVB));
+	else
+		BUG();
 }
 
 static bool