---

yaml --- r: 64876 b: refs/heads/master c: f443675 h: refs/heads/master v: v3
git-mirror · Sep 12, 2007 · bb34bd6 · bb34bd6
1 parent 0f3626f
commit bb34bd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);