From 12e42faef97b9b60c02cc983ac2d4d90d1fb8dfd Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Tue, 11 Sep 2007 15:23:58 -0700 Subject: [PATCH] --- yaml --- r: 64877 b: refs/heads/master c: 4740622c5c805d88c63a50747a2d05537dd233cf h: refs/heads/master i: 64875: 0f3626f86a630c94412afd1543af691524e9008b v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-agp.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 95c22bc773d1..f5c91b11d0f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f443675affe3f16dd428e46f0f7fd3f4d703eeab +refs/heads/master: 4740622c5c805d88c63a50747a2d05537dd233cf diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c index 581f9222a9d1..7c69bf259caa 100644 --- a/trunk/drivers/char/agp/intel-agp.c +++ b/trunk/drivers/char/agp/intel-agp.c @@ -919,6 +919,7 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) struct aper_size_info_fixed *size; int num_entries; u32 temp, temp2; + int gtt_map_size = 256 * 1024; size = agp_bridge->current_size; page_order = size->page_order; @@ -928,7 +929,9 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); pci_read_config_dword(intel_private.pcidev, I915_PTEADDR,&temp2); - intel_private.gtt = ioremap(temp2, 256 * 1024); + if (IS_G33) + gtt_map_size = 1024 * 1024; /* 1M on G33 */ + intel_private.gtt = ioremap(temp2, gtt_map_size); if (!intel_private.gtt) return -ENOMEM;