Commit c000273e authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie

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: default avatarJerome Glisse <jglisse@redhat.com>
Acked-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 119e20dc
...@@ -181,6 +181,12 @@ int r300_gart_enable(struct radeon_device *rdev) ...@@ -181,6 +181,12 @@ int r300_gart_enable(struct radeon_device *rdev)
rdev->asic->gart_set_page = &rv370_pcie_gart_set_page; rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
return rv370_pcie_gart_enable(rdev); 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); return r100_pci_gart_enable(rdev);
} }
......
...@@ -101,8 +101,13 @@ int r420_mc_init(struct radeon_device *rdev) ...@@ -101,8 +101,13 @@ int r420_mc_init(struct radeon_device *rdev)
void r420_mc_fini(struct radeon_device *rdev) void r420_mc_fini(struct radeon_device *rdev)
{ {
rv370_pcie_gart_disable(rdev); if (rdev->flags & RADEON_IS_PCIE) {
radeon_gart_table_vram_free(rdev); rv370_pcie_gart_disable(rdev);
radeon_gart_table_vram_free(rdev);
} else {
r100_pci_gart_disable(rdev);
radeon_gart_table_ram_free(rdev);
}
radeon_gart_fini(rdev); radeon_gart_fini(rdev);
} }
......
...@@ -935,6 +935,10 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v) ...@@ -935,6 +935,10 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ /* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */
void r100_cp_disable(struct radeon_device *rdev); void r100_cp_disable(struct radeon_device *rdev);
void r100_pci_gart_tlb_flush(struct radeon_device *rdev);
int r100_pci_gart_enable(struct radeon_device *rdev);
void r100_pci_gart_disable(struct radeon_device *rdev);
int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
/* r420,r423,rv410 */ /* r420,r423,rv410 */
u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg); u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg);
......
...@@ -503,7 +503,7 @@ int radeon_device_init(struct radeon_device *rdev, ...@@ -503,7 +503,7 @@ int radeon_device_init(struct radeon_device *rdev,
if (radeon_agpmode == -1) { if (radeon_agpmode == -1) {
rdev->flags &= ~RADEON_IS_AGP; rdev->flags &= ~RADEON_IS_AGP;
if (rdev->family > CHIP_RV515 || if (rdev->family >= CHIP_RV515 ||
rdev->family == CHIP_RV380 || rdev->family == CHIP_RV380 ||
rdev->family == CHIP_RV410 || rdev->family == CHIP_RV410 ||
rdev->family == CHIP_R423) { rdev->family == CHIP_R423) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment