summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Ashton <joshua@froggi.es>2024-01-18 21:45:39 +0000
committerJoshua Ashton <joshua@froggi.es>2024-01-18 21:45:39 +0000
commitc65fc39be869b0fa4e21f5428e9b80059cccdec6 (patch)
tree5629c080f9e5ba6403382c42b8dd801535126065
parent15557ded5c35fe901a2b05766a481874c4e727b4 (diff)
downloadlinux-c65fc39be869b0fa4e21f5428e9b80059cccdec6.tar.gz
drm/amdgpu: Bump soft recovery timeout to 1s
Seems more reliable.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index e79ba4b171ae..1631c0c7c21b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -446,7 +446,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid,
 
 	atomic_inc(&ring->adev->gpu_reset_counter);
 
-	deadline = ktime_add_us(ktime_get(), 10000);
+	deadline = ktime_add_ms(ktime_get(), 1000);
 	while (!dma_fence_is_signaled(fence) &&
 	       ktime_to_ns(ktime_sub(deadline, ktime_get())) > 0)
 		ring->funcs->soft_recovery(ring, vmid);