Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 06:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

intel_agp: fix GTT map size on G33

Browse Source 
G33 has 1MB GTT table range.  Fix GTT mapping in case like 512MB aperture
size.

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>
This commit is contained in:
Zhenyu Wang 2007-09-11 15:23:58 -07:00 committed by Linus Torvalds
parent f443675aff
commit 4740622c5c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/char/agp/intel-agp.c
View File

@ -919,6 +919,7 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
struct aper_size_info_fixed *size; struct aper_size_info_fixed *size;
int num_entries; int num_entries;
u32 temp, temp2; u32 temp, temp2;
int gtt_map_size = 256 * 1024;
size = agp_bridge->current_size; size = agp_bridge->current_size;
page_order = size->page_order; 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_MMADDR, &temp);
pci_read_config_dword(intel_private.pcidev, I915_PTEADDR,&temp2); 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) if (!intel_private.gtt)
return -ENOMEM; return -ENOMEM;