summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r300.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2009-09-10 13:47:09 +0200
committerDave Airlie <airlied@redhat.com>2009-09-11 03:41:34 +0200
commitc000273ebc830c27b8c9e03d5f4c147d3e310f48 (patch)
tree68e453c02a23d38dce7b4d67f29fa59a099c3510 /drivers/gpu/drm/radeon/r300.c
parentdrm/radeon/kms/r600: fix blit support (diff)
downloadlinux-c000273ebc830c27b8c9e03d5f4c147d3e310f48.tar.xz
linux-c000273ebc830c27b8c9e03d5f4c147d3e310f48.zip
drm/radeon/kms: R3XX/R4XX AGP asic use PCI GART not PCIE GART
R3XX/R4XX AGP asic use the old PCI GART block, not the new PCIE GART. Make sure we pick the right GART when disabling AGP. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Acked-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
-rw-r--r--drivers/gpu/drm/radeon/r300.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index a5f82f7beed6..9c17b786982a 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -181,6 +181,12 @@ int r300_gart_enable(struct radeon_device *rdev)
rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
return rv370_pcie_gart_enable(rdev);
}
+ if (rdev->flags & RADEON_IS_PCI) {
+ rdev->asic->gart_disable = &r100_pci_gart_disable;
+ rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
+ rdev->asic->gart_set_page = &r100_pci_gart_set_page;
+ return r100_pci_gart_enable(rdev);
+ }
return r100_pci_gart_enable(rdev);
}