---

yaml --- r: 269823 b: refs/heads/master c: acc83eb h: refs/heads/master i: 269821: 30fd081 269819: 0d1f876 269815: c0778e3 269807: 8b2990e 269791: 06e1c5a 269759: 7498832 269695: 663be59 269567: 551d3ab 269311: e1964ef v: v3
git-mirror · Oct 20, 2011 · 670fac9 · 670fac9
1 parent e4389c0
commit 670fac9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fdd4d98e56e0919bb324c2ab1ff66395cf3b385
+refs/heads/master: acc83eb5a1e0ae7dbbf89ca2a1a943ade224bb84
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c b/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -92,7 +92,10 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
 	uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
 	uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
 
-	if (INTEL_INFO(dev)->gen >= 5) {
+	if (INTEL_INFO(dev)->gen >= 6) {
+		swizzle_x = I915_BIT_6_SWIZZLE_NONE;
+		swizzle_y = I915_BIT_6_SWIZZLE_NONE;
+	} else if (IS_GEN5(dev)) {
 		/* On Ironlake whatever DRAM config, GPU always do
 		 * same swizzling setup.
 		 */