drm/amdgpu: cleanup GPU recovery check a bit (v2)

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_irq.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 1abf5b5bac9e547cda0eb93bcaaf07d407e96007..b927e87985344980c359883b6c76f219923092e0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -105,8 +105,8 @@ static void amdgpu_irq_reset_work_func(struct work_struct *work)
        struct amdgpu_device *adev = container_of(work, struct amdgpu_device,
                                                  reset_work);
 
-       if (!amdgpu_sriov_vf(adev))
-               amdgpu_device_gpu_recover(adev, NULL, false);
+       if (!amdgpu_sriov_vf(adev) && amdgpu_device_should_recover_gpu(adev))
+               amdgpu_device_gpu_recover(adev, NULL);
 }
 
 /**