diff options
| author | Joshua Ashton <joshua@froggi.es> | 2024-01-16 00:51:25 +0000 |
|---|---|---|
| committer | Joshua Ashton <joshua@froggi.es> | 2024-01-18 21:45:10 +0000 |
| commit | 15557ded5c35fe901a2b05766a481874c4e727b4 (patch) | |
| tree | 2f2bc269a3bcfe849b1bcb9d891ec5e88c40a331 | |
| parent | 74608271c2ec4fc242875ef0b9cd39ce0e5964fc (diff) | |
| download | linux-15557ded5c35fe901a2b05766a481874c4e727b4.tar.gz | |
drm/amdgpu: Determine soft recovery deadline next to usage
Otherwise we are determining this timeout based on a time before we go into some spinlock, which is bad. Signed-off-by: Joshua Ashton <joshua@froggi.es>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 5d1a6e95b02e..e79ba4b171ae 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -434,8 +434,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid, struct dma_fence *fence) { unsigned long flags; - - ktime_t deadline = ktime_add_us(ktime_get(), 10000); + ktime_t deadline; if (amdgpu_sriov_vf(ring->adev) || !ring->funcs->soft_recovery || !fence) return false; @@ -446,6 +445,8 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid, spin_unlock_irqrestore(fence->lock, flags); atomic_inc(&ring->adev->gpu_reset_counter); + + deadline = ktime_add_us(ktime_get(), 10000); while (!dma_fence_is_signaled(fence) && ktime_to_ns(ktime_sub(deadline, ktime_get())) > 0) ring->funcs->soft_recovery(ring, vmid); |