From 34a9be106def1059a19b5899505b8035dbc66329 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 15 Oct 2008 00:05:58 -0700
Subject: [PATCH] --- yaml --- r: 115727 b: refs/heads/master c:
 b612eda98e4b4bae4c98a863f039bc89425f9039 h: refs/heads/master i:   115725:
 b20b4b33743c7c3aa79b28a42d60ab5a3f6659f1   115723:
 fa6ed524477b1afb53f68942e529a76840918621   115719:
 0556915caf8cb6ccbb426d2fb9b6e6674bb86f3f   115711:
 e281c12e6d78a68ba5311872c14802097f9980a2 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem_tiling.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6048b1a99108..f30d7b2692c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dbe2772d6af067845bab57be490c302f4490ac7
+refs/heads/master: b612eda98e4b4bae4c98a863f039bc89425f9039
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c b/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c
index 6b3f1e4a34a1..e8b85ac4ca04 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -96,7 +96,8 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
 		 */
 		swizzle_x = I915_BIT_6_SWIZZLE_NONE;
 		swizzle_y = I915_BIT_6_SWIZZLE_NONE;
-	} else if ((!IS_I965G(dev) && !IS_G33(dev)) || IS_I965GM(dev)) {
+	} else if ((!IS_I965G(dev) && !IS_G33(dev)) || IS_I965GM(dev) ||
+		   IS_GM45(dev)) {
 		uint32_t dcc;
 
 		/* On 915-945 and GM965, channel interleave by the CPU is
@@ -118,7 +119,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
 			    dcc & DCC_CHANNEL_XOR_DISABLE) {
 				swizzle_x = I915_BIT_6_SWIZZLE_9_10;
 				swizzle_y = I915_BIT_6_SWIZZLE_9;
-			} else if (IS_I965GM(dev)) {
+			} else if (IS_I965GM(dev) || IS_GM45(dev)) {
 				/* GM965 only does bit 11-based channel
 				 * randomization
 				 */