drm/radeon: Finish GART and AGP resources after TTM
Subsystems (2)
PATCH 1/1 drm/radeon: Finish GART and AGP resources after TTM
When called during unloading, the function radeon_gart_unbind() may complain about the GART not being initialized.
TTM calls the function radeon_gart_unbind() as part of its finish procedure and expects the GART structure to be initialized. As the radeon driver calls radeon_gart_fini() before finishing TTM, radeon_gart_unbind() complains with
trying to unbind memory from uninitialized GART !
This patch reorders the shutdown such that GART and AGP resources are always finished after TTM. The problem has been observed on SI hardware. The code for other hardware is being fixed accordingly.
Signed-off-by Thomas Zimmermann <[email protected]>
--- drivers/gpu/drm/radeon/cik.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r100.c | 6 +++--- drivers/gpu/drm/radeon/r300.c | 6 +++--- drivers/gpu/drm/radeon/r600.c | 4 ++-- drivers/gpu/drm/radeon/rs400.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 4 ++-- drivers/gpu/drm/radeon/si.c | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/radeon/cik.c +1 -1
@@ -8727,11 +8727,11 @@ void cik_fini(struct radeon_device *rdev)uvd_v1_0_fini (rdev);radeon_uvd_fini (rdev);radeon_vce_fini (rdev); -cik_pcie_gart_fini (rdev);r600_vram_scratch_fini (rdev);radeon_gem_fini (rdev);radeon_fence_driver_fini (rdev);radeon_bo_fini (rdev); +cik_pcie_gart_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/evergreen.c +1 -1
@@ -5307,12 +5307,12 @@ void evergreen_fini(struct radeon_device *rdev)radeon_irq_kms_fini (rdev);uvd_v1_0_fini (rdev);radeon_uvd_fini (rdev); -evergreen_pcie_gart_fini (rdev);r600_vram_scratch_fini (rdev);radeon_gem_fini (rdev);radeon_fence_driver_fini (rdev);radeon_agp_fini (rdev);radeon_bo_fini (rdev); +evergreen_pcie_gart_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/ni.c +1 -1
@@ -2487,11 +2487,11 @@ void cayman_fini(struct radeon_device *rdev)radeon_uvd_fini (rdev);if (rdev->has_vce)radeon_vce_fini (rdev); -cayman_pcie_gart_fini (rdev);r600_vram_scratch_fini (rdev);radeon_gem_fini (rdev);radeon_fence_driver_fini (rdev);radeon_bo_fini (rdev); +cayman_pcie_gart_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/r100.c +3 -3
@@ -3984,12 +3984,12 @@ void r100_fini(struct radeon_device *rdev)radeon_wb_fini (rdev);radeon_ib_pool_fini (rdev);radeon_gem_fini (rdev); -if (rdev->flags &RADEON_IS_PCI ) -r100_pci_gart_fini (rdev); -radeon_agp_fini (rdev);radeon_irq_kms_fini (rdev);radeon_fence_driver_fini (rdev);radeon_bo_fini (rdev); +if (rdev->flags &RADEON_IS_PCI ) +r100_pci_gart_fini (rdev); +radeon_agp_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/r300.c +3 -3
@@ -1488,14 +1488,14 @@ void r300_fini(struct radeon_device *rdev)radeon_wb_fini (rdev);radeon_ib_pool_fini (rdev);radeon_gem_fini (rdev); +radeon_irq_kms_fini (rdev); +radeon_fence_driver_fini (rdev); +radeon_bo_fini (rdev);if (rdev->flags &RADEON_IS_PCIE )rv370_pcie_gart_fini (rdev);if (rdev->flags &RADEON_IS_PCI )r100_pci_gart_fini (rdev);radeon_agp_fini (rdev); -radeon_irq_kms_fini (rdev); -radeon_fence_driver_fini (rdev); -radeon_bo_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/r600.c +2 -2
@@ -3345,12 +3345,12 @@ void r600_fini(struct radeon_device *rdev)radeon_wb_fini (rdev);radeon_ib_pool_fini (rdev);radeon_irq_kms_fini (rdev); -r600_pcie_gart_fini (rdev);r600_vram_scratch_fini (rdev); -radeon_agp_fini (rdev);radeon_gem_fini (rdev);radeon_fence_driver_fini (rdev);radeon_bo_fini (rdev); +r600_pcie_gart_fini (rdev); +radeon_agp_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/rs400.c +1 -1
@@ -504,10 +504,10 @@ void rs400_fini(struct radeon_device *rdev)radeon_wb_fini (rdev);radeon_ib_pool_fini (rdev);radeon_gem_fini (rdev); -rs400_gart_fini (rdev);radeon_irq_kms_fini (rdev);radeon_fence_driver_fini (rdev);radeon_bo_fini (rdev); +rs400_gart_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/rs600.c +1 -1
@@ -1082,10 +1082,10 @@ void rs600_fini(struct radeon_device *rdev)radeon_wb_fini (rdev);radeon_ib_pool_fini (rdev);radeon_gem_fini (rdev); -rs600_gart_fini (rdev);radeon_irq_kms_fini (rdev);radeon_fence_driver_fini (rdev);radeon_bo_fini (rdev); +rs600_gart_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/rv770.c +2 -2
@@ -2007,12 +2007,12 @@ void rv770_fini(struct radeon_device *rdev)radeon_irq_kms_fini (rdev);uvd_v1_0_fini (rdev);radeon_uvd_fini (rdev); -rv770_pcie_gart_fini (rdev);r600_vram_scratch_fini (rdev);radeon_gem_fini (rdev);radeon_fence_driver_fini (rdev); -radeon_agp_fini (rdev);radeon_bo_fini (rdev); +rv770_pcie_gart_fini (rdev); +radeon_agp_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
drivers/gpu/drm/radeon/si.c +1 -1
@@ -6960,11 +6960,11 @@ void si_fini(struct radeon_device *rdev) }if (rdev->has_vce)radeon_vce_fini (rdev); -si_pcie_gart_fini (rdev);r600_vram_scratch_fini (rdev);radeon_gem_fini (rdev);radeon_fence_driver_fini (rdev);radeon_bo_fini (rdev); +si_pcie_gart_fini (rdev);radeon_atombios_fini (rdev);kfree (rdev->bios); rdev->bios =NULL ;
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx