---

yaml --- r: 139839 b: refs/heads/master c: 4a8df45 h: refs/heads/master i: 139837: 276ad08 139835: 6f8be82 139831: 3e41a21 139823: 368c72e 139807: 273ccbb 139775: 358f409 v: v3
git-mirror · Apr 1, 2009 · 1bf8253 · 1bf8253
1 parent c4e0563
commit 1bf8253
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b731a65c86119da808b3687e0bbb8f18ab137ad
+refs/heads/master: 4a8df45894d26dc503013ea630927731c24be6b8
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -922,7 +922,7 @@ static int i915_probe_agp(struct drm_device *dev, unsigned long *aperture_size,
 	 * Some of the preallocated space is taken by the GTT
 	 * and popup.  GTT is 1K per MB of aperture size, and popup is 4K.
 	 */
-	if (IS_G4X(dev))
+	if (IS_G4X(dev) || IS_IGD(dev))
 		overhead = 4096;
 	else
 		overhead = (*aperture_size / 1024) + 4096;