tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

* 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] intel_agp: fix G965 GTT size detect

Linus Torvalds 0bce0b7a c3474be4

+1 -2
unified split
+1 -2
drivers/char/agp/intel-agp.c
··· 431 432 if (IS_I965) { 433 u32 pgetbl_ctl; 434 435 - pci_read_config_dword(agp_bridge->dev, I810_PGETBL_CTL, 436 - &pgetbl_ctl); 437 /* The 965 has a field telling us the size of the GTT, 438 * which may be larger than what is necessary to map the 439 * aperture.
··· 431 432 if (IS_I965) { 433 u32 pgetbl_ctl; 434 + pgetbl_ctl = readl(intel_i830_private.registers+I810_PGETBL_CTL); 435 436 /* The 965 has a field telling us the size of the GTT, 437 * which may be larger than what is necessary to map the 438 * aperture.