summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorWang Zhenyu2007-04-10 03:42:48 +0200
committerDave Jones2007-04-10 04:09:58 +0200
commit52ea0718ea506df0915eacedb439e65c5f214e0e (patch)
tree01e68ba08924faa8b458159c861b394a6f8053ad /drivers/char/agp
parent[AGPGART] intel_agp: PCI id update for Intel 965GM (diff)
downloadkernel-qcow2-linux-52ea0718ea506df0915eacedb439e65c5f214e0e.tar.gz
kernel-qcow2-linux-52ea0718ea506df0915eacedb439e65c5f214e0e.tar.xz
kernel-qcow2-linux-52ea0718ea506df0915eacedb439e65c5f214e0e.zip
[AGPGART] intel_agp: fix G965 GTT size detect
On G965, I810_PGETBL_CTL is a mmio offset, but we wrongly take it as pci config space offset in detecting GTT size. This one line patch fixs this. Signed-off-by: Wang Zhenyu <zhenyu.z.wang@intel.com> Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/intel-agp.c3
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.