Skip to content

Commit 89fae8d

Browse files
ChristianKoenigAMDalexdeucher
authored andcommitted
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> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 0a33b11 commit 89fae8d

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,11 +433,18 @@ void amdgpu_ring_emit_reg_write_reg_wait_helper(struct amdgpu_ring *ring,
433433
bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid,
434434
struct dma_fence *fence)
435435
{
436+
unsigned long flags;
437+
436438
ktime_t deadline = ktime_add_us(ktime_get(), 10000);
437439

438440
if (amdgpu_sriov_vf(ring->adev) || !ring->funcs->soft_recovery || !fence)
439441
return false;
440442

443+
spin_lock_irqsave(fence->lock, flags);
444+
if (!dma_fence_is_signaled_locked(fence))
445+
dma_fence_set_error(fence, -ENODATA);
446+
spin_unlock_irqrestore(fence->lock, flags);
447+
441448
atomic_inc(&ring->adev->gpu_reset_counter);
442449
while (!dma_fence_is_signaled(fence) &&
443450
ktime_to_ns(ktime_sub(deadline, ktime_get())) > 0)

0 commit comments

Comments
 (0)