From: YuBiao Wang Date: Tue, 19 Oct 2021 21:16:23 +0000 (-0400) Subject: drm/amd/amdgpu: Do irq_fini_hw after ip_fini_early X-Git-Tag: v6.1-rc5~2647^2~13^2~56 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3848df60b0606da8a12f34d34eef5183b07fc38;p=platform%2Fkernel%2Flinux-starfive.git drm/amd/amdgpu: Do irq_fini_hw after ip_fini_early [Why] drm_irq_uninstall is called in irq_fini_hw so that irq is disabled in sw stage. SMU (and maybe other IP blocks) fini_hw will call irq_put for cleanup and the whole cleanup process will be skipped because of drm->irq_enable = false. [How] Move ip_fini_early before irq_fini_hw. Signed-off-by: YuBiao Wang Reviewed-by: Andrey Grodzovsky Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 7798276..69e0ecc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3835,10 +3835,10 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) amdgpu_fbdev_fini(adev); - amdgpu_irq_fini_hw(adev); - amdgpu_device_ip_fini_early(adev); + amdgpu_irq_fini_hw(adev); + ttm_device_clear_dma_mappings(&adev->mman.bdev); amdgpu_gart_dummy_page_fini(adev);