1 files changed, 11 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 7056925eb386..5448cf27654e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -216,8 +216,10 @@ static void amdgpu_fence_schedule_fallback(struct amdgpu_ring *ring)
  * Checks the current fence value and calculates the last
  * signalled fence value. Wakes the fence queue if the
  * sequence number has increased.
+ *
+ * Returns true if fence was processed
  */
-void amdgpu_fence_process(struct amdgpu_ring *ring)
+bool amdgpu_fence_process(struct amdgpu_ring *ring)
 {
         struct amdgpu_fence_driver *drv = &ring->fence_drv;
         uint32_t seq, last_seq;
@@ -229,11 +231,12 @@ void amdgpu_fence_process(struct amdgpu_ring *ring)
 
         } while (atomic_cmpxchg(&drv->last_seq, last_seq, seq) != last_seq);
 
-        if (seq != ring->fence_drv.sync_seq)
+        if (del_timer(&ring->fence_drv.fallback_timer) &&
+            seq != ring->fence_drv.sync_seq)
                 amdgpu_fence_schedule_fallback(ring);
 
         if (unlikely(seq == last_seq))
-                return;
+                return false;
 
         last_seq &= drv->num_fences_mask;
         seq &= drv->num_fences_mask;
@@ -260,6 +263,8 @@ void amdgpu_fence_process(struct amdgpu_ring *ring)
 
                 dma_fence_put(fence);
         } while (last_seq != seq);
+
+        return true;
 }
 
 /**
@@ -274,7 +279,8 @@ static void amdgpu_fence_fallback(struct timer_list *t)
         struct amdgpu_ring *ring = from_timer(ring, t,
                                               fence_drv.fallback_timer);
 
-        amdgpu_fence_process(ring);
+        if (amdgpu_fence_process(ring))
+                DRM_WARN("Fence fallback timer expired on ring %s\n", ring->name);
 }
 
 /**
@@ -701,7 +707,7 @@ static int amdgpu_debugfs_gpu_recover(struct seq_file *m, void *data)
         struct amdgpu_device *adev = dev->dev_private;
 
         seq_printf(m, "gpu recover\n");
-        amdgpu_device_gpu_recover(adev, NULL, true);
+        amdgpu_device_gpu_recover(adev, NULL);
 
         return 0;
 }