From 1bf8253cbd0483cf20438f58bca78336dd717a06 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Fri, 13 Mar 2009 16:22:33 +0800
Subject: [PATCH] --- yaml --- r: 139839 b: refs/heads/master c:
 4a8df45894d26dc503013ea630927731c24be6b8 h: refs/heads/master i:   139837:
 276ad089b0b661e969ff49e095da4849b78fa893   139835:
 6f8be822d5e2a10bad9628a9b21a4f4d4e215abe   139831:
 3e41a21ebc65990ad92d158de66a2d23d42fba3f   139823:
 368c72e1e1495ef8996a6167bae27167de37d15c   139807:
 273ccbb7f80a713d63a84e54a5a17b448d39203f   139775:
 358f40954a177056b274ebff230831d79f0fd2c5 v: v3

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

diff --git a/[refs] b/[refs]
index 4a0d90cc9fc1..4877b17e4c7f 100644
--- 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
index 85549f615b1f..8ce57f9b11fa 100644
--- 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;