Skip to content

Commit f734b21

Browse files
EmilyDeng666alexdeucher
authored andcommitted
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 <[email protected]> Acked-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 7692e1e commit f734b21

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4537,6 +4537,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
45374537
r = amdgpu_virt_reset_gpu(adev);
45384538
if (r)
45394539
return r;
4540+
amdgpu_irq_gpu_reset_resume_helper(adev);
45404541

45414542
/* some sw clean up VF needs to do before recover */
45424543
amdgpu_virt_post_reset(adev);
@@ -4566,7 +4567,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
45664567
amdgpu_put_xgmi_hive(hive);
45674568

45684569
if (!r) {
4569-
amdgpu_irq_gpu_reset_resume_helper(adev);
45704570
r = amdgpu_ib_ring_tests(adev);
45714571

45724572
amdgpu_amdkfd_post_reset(adev);

0 commit comments

Comments
 (0)