summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyu.z.wang@intel.com>2007-09-11 15:23:57 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-11 17:21:20 -0700
commitf443675affe3f16dd428e46f0f7fd3f4d703eeab (patch)
tree9f8be600ff47c1e8e6c0e86e110f62c1dceb8ca4 /drivers
parente845498e4ce4b0e704761e9462e5c29895ced34f (diff)
downloadlinux-f443675affe3f16dd428e46f0f7fd3f4d703eeab.tar.gz
linux-f443675affe3f16dd428e46f0f7fd3f4d703eeab.tar.bz2
linux-f443675affe3f16dd428e46f0f7fd3f4d703eeab.zip
intel_agp: fix stolen mem range on G33
G33 GTT stolen memory is below graphics data stolen memory and be seperate, so don't subtract it in stolen mem counting. Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com> Acked-by: Dave Airlie <airlied@linux.ie> Cc: Dave Jones <davej@codemonkey.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/agp/intel-agp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 2c9ca2c64628..581f9222a9d1 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/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);