diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:24:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:24:56 -0700 |
| commit | 0bce0b7a3b25b33220be77dcaf3dc4585641100c (patch) | |
| tree | 276c0a66993b047b978c1aebc19060dcf8fc61cf /drivers/char | |
| parent | c3474be4ddcae0256a13cbbe35d849c153c4ec4b (diff) | |
| parent | 52ea0718ea506df0915eacedb439e65c5f214e0e (diff) | |
| download | linux-0bce0b7a3b25b33220be77dcaf3dc4585641100c.tar.gz linux-0bce0b7a3b25b33220be77dcaf3dc4585641100c.tar.bz2 linux-0bce0b7a3b25b33220be77dcaf3dc4585641100c.zip | |
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
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index a9fdbf9126ca..55392a45a14b 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -431,9 +431,8 @@ static void intel_i830_init_gtt_entries(void) if (IS_I965) { u32 pgetbl_ctl; + pgetbl_ctl = readl(intel_i830_private.registers+I810_PGETBL_CTL); - pci_read_config_dword(agp_bridge->dev, I810_PGETBL_CTL, - &pgetbl_ctl); /* The 965 has a field telling us the size of the GTT, * which may be larger than what is necessary to map the * aperture. |