Commit f734b213 authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher

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: default avatarEmily Deng <Emily.Deng@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7692e1ee
...@@ -4537,6 +4537,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, ...@@ -4537,6 +4537,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
r = amdgpu_virt_reset_gpu(adev); r = amdgpu_virt_reset_gpu(adev);
if (r) if (r)
return r; return r;
amdgpu_irq_gpu_reset_resume_helper(adev);
/* some sw clean up VF needs to do before recover */ /* some sw clean up VF needs to do before recover */
amdgpu_virt_post_reset(adev); amdgpu_virt_post_reset(adev);
...@@ -4566,7 +4567,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, ...@@ -4566,7 +4567,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
amdgpu_put_xgmi_hive(hive); amdgpu_put_xgmi_hive(hive);
if (!r) { if (!r) {
amdgpu_irq_gpu_reset_resume_helper(adev);
r = amdgpu_ib_ring_tests(adev); r = amdgpu_ib_ring_tests(adev);
amdgpu_amdkfd_post_reset(adev); amdgpu_amdkfd_post_reset(adev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment