drm/amd/amdgpu: Do irq_fini_hw after ip_fini_early
authorYuBiao Wang <YuBiao.Wang@amd.com>
Tue, 19 Oct 2021 21:16:23 +0000 (17:16 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 19 Oct 2021 21:16:50 +0000 (17:16 -0400)
[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 <YuBiao.Wang@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 7798276..69e0ecc 100644 (file)
@@ -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);