lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/radeon/kms: R3XX/R4XX AGP asic use PCI GART not PCIE GART

Browse Source 
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>
This commit is contained in:
Jerome Glisse
2009-09-10 13:47:09 +02:00
committed by Dave Airlie
parent 119e20dc14
commit c000273ebc
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/radeon/r300.c
View File

@@ -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);
} }

5
drivers/gpu/drm/radeon/r420.c
View File

@@ -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)
{ {
if (rdev->flags & RADEON_IS_PCIE) {
rv370_pcie_gart_disable(rdev); rv370_pcie_gart_disable(rdev);
radeon_gart_table_vram_free(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);
} }

4
drivers/gpu/drm/radeon/radeon.h
View File

@@ -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);

2
drivers/gpu/drm/radeon/radeon_device.c
View File

@@ -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) {