From 42ee92afa6db6c31090d72c4eba6ef0958de2d07 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 18 Sep 2007 22:46:35 -0700
Subject: [PATCH] --- yaml --- r: 65027 b: refs/heads/master c:
 e67aa27a6179c287983c6c525beb5320f5cd1672 h: refs/heads/master i:   65025:
 a7161639179e88ea0e0d8dc782f48e5a3d5ad39c   65023:
 d28d8c37e3f4ff6dcc1d46d824766f7e7493564d v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/agp/agp.h       | 3 ++-
 trunk/drivers/char/agp/intel-agp.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8792c9b56e51..a46d2ce8eef0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c8bd037e5bd7bbc3c82b74cbed4da1ddc3fe8de
+refs/heads/master: e67aa27a6179c287983c6c525beb5320f5cd1672
diff --git a/trunk/drivers/char/agp/agp.h b/trunk/drivers/char/agp/agp.h
index 35ab1a9f8e8b..8955e7ff759a 100644
--- a/trunk/drivers/char/agp/agp.h
+++ b/trunk/drivers/char/agp/agp.h
@@ -176,7 +176,7 @@ struct agp_bridge_data {
 #define I830_GMCH_MEM_MASK		0x1
 #define I830_GMCH_MEM_64M		0x1
 #define I830_GMCH_MEM_128M		0
-#define I830_GMCH_GMS_MASK		0xF0
+#define I830_GMCH_GMS_MASK		0x70
 #define I830_GMCH_GMS_DISABLED		0x00
 #define I830_GMCH_GMS_LOCAL		0x10
 #define I830_GMCH_GMS_STOLEN_512	0x20
@@ -190,6 +190,7 @@ struct agp_bridge_data {
 #define INTEL_I830_ERRSTS	0x92
 
 /* Intel 855GM/852GM registers */
+#define I855_GMCH_GMS_MASK		0xF0
 #define I855_GMCH_GMS_STOLEN_0M		0x0
 #define I855_GMCH_GMS_STOLEN_1M		(0x1 << 4)
 #define I855_GMCH_GMS_STOLEN_4M		(0x2 << 4)
diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c
index 7c69bf259caa..a5d0e95a227a 100644
--- a/trunk/drivers/char/agp/intel-agp.c
+++ b/trunk/drivers/char/agp/intel-agp.c
@@ -511,7 +511,7 @@ static void intel_i830_init_gtt_entries(void)
 		 */
 		if (IS_G33)
 			size = 0;
-		switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
+		switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
 		case I855_GMCH_GMS_STOLEN_1M:
 			gtt_entries = MB(1) - KB(size);
 			break;