diff options
| author | Christian König <christian.koenig@amd.com> | 2023-04-17 13:04:06 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2023-04-24 11:33:32 +0200 |
| commit | 46671a1b844d5804cec2102f774fcb4f56643513 (patch) | |
| tree | 8588a62706b615ee2ddc57cd5ee7d7687e31b2f8 /drivers | |
| parent | 043f2271e2d0aa904b259f4601814f62f4e5a1ee (diff) | |
| download | linux-46671a1b844d5804cec2102f774fcb4f56643513.tar.gz | |
drm/amdgpu: mark soft recovered fences with -ENODATA
Set the fence error code before trying to soft-recover it. It gets overwritten when a hard recovery is required. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 697953a85930..6515ad3d4913 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -434,11 +434,18 @@ void amdgpu_ring_emit_reg_write_reg_wait_helper(struct amdgpu_ring *ring, 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); if (amdgpu_sriov_vf(ring->adev) || !ring->funcs->soft_recovery || !fence) return false; + spin_lock_irqsave(fence->lock, flags); + if (!dma_fence_is_signaled_locked(fence)) + dma_fence_set_error(fence, -ENODATA); + spin_unlock_irqrestore(fence->lock, flags); + atomic_inc(&ring->adev->gpu_reset_counter); while (!dma_fence_is_signaled(fence) && ktime_to_ns(ktime_sub(deadline, ktime_get())) > 0) |