diff options
author | Jerome Glisse <jglisse@redhat.com> | 2009-09-10 07:47:09 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-09-10 21:41:34 -0400 |
commit | c000273ebc830c27b8c9e03d5f4c147d3e310f48 (patch) | |
tree | 68e453c02a23d38dce7b4d67f29fa59a099c3510 /drivers/gpu/drm/radeon/r300.c | |
parent | 119e20dc149581db3064661b2e659f308f97b663 (diff) |
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.c | 6 |
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) | |||
181 | rdev->asic->gart_set_page = &rv370_pcie_gart_set_page; | 181 | rdev->asic->gart_set_page = &rv370_pcie_gart_set_page; |
182 | return rv370_pcie_gart_enable(rdev); | 182 | return rv370_pcie_gart_enable(rdev); |
183 | } | 183 | } |
184 | if (rdev->flags & RADEON_IS_PCI) { | ||
185 | rdev->asic->gart_disable = &r100_pci_gart_disable; | ||
186 | rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush; | ||
187 | rdev->asic->gart_set_page = &r100_pci_gart_set_page; | ||
188 | return r100_pci_gart_enable(rdev); | ||
189 | } | ||
184 | return r100_pci_gart_enable(rdev); | 190 | return r100_pci_gart_enable(rdev); |
185 | } | 191 | } |
186 | 192 | ||