From bb34bd64f632bd777f9b70d0295f7e26cf88e2a5 Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Tue, 11 Sep 2007 15:23:57 -0700
Subject: [PATCH] --- yaml --- r: 64876 b: refs/heads/master c:
 f443675affe3f16dd428e46f0f7fd3f4d703eeab h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/agp/intel-agp.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aa93f96337b5..95c22bc773d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e845498e4ce4b0e704761e9462e5c29895ced34f
+refs/heads/master: f443675affe3f16dd428e46f0f7fd3f4d703eeab
diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c
index 2c9ca2c64628..581f9222a9d1 100644
--- a/trunk/drivers/char/agp/intel-agp.c
+++ b/trunk/drivers/char/agp/intel-agp.c
@@ -506,6 +506,11 @@ static void intel_i830_init_gtt_entries(void)
 			break;
 		}
 	} else {
+		/* G33's GTT stolen memory is separate from gfx data
+		 * stolen memory.
+		 */
+		if (IS_G33)
+			size = 0;
 		switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
 		case I855_GMCH_GMS_STOLEN_1M:
 			gtt_entries = MB(1) - KB(size);