From: Emily Deng Date: Mon, 7 Aug 2023 05:08:43 +0000 (+0800) Subject: drm/amdgpu/irq: Move irq resume to the beginning X-Git-Tag: v6.6-rc1~136^2~7^2~11 X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=f734b2133c803a58174e70e4677d0d02220e2379;p=linux%2F.git drm/amdgpu/irq: Move irq resume to the beginning Need to move irq resume to the beginning of reset sriov, or if one interrupt occurs before irq resume, then the irq won't work anymore. Signed-off-by: Emily Deng Acked-by: Alex Deucher 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 4f818f13dc9d..aa171db68639 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4537,6 +4537,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, r = amdgpu_virt_reset_gpu(adev); if (r) return r; + amdgpu_irq_gpu_reset_resume_helper(adev); /* some sw clean up VF needs to do before recover */ amdgpu_virt_post_reset(adev); @@ -4566,7 +4567,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, amdgpu_put_xgmi_hive(hive); if (!r) { - amdgpu_irq_gpu_reset_resume_helper(adev); r = amdgpu_ib_ring_tests(adev); amdgpu_amdkfd_post_reset(adev);