Commit 86790e30 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Increase reset counter only on success 



Increment the reset counter only if soft recovery succeeded. This is
consistent with a ring hard reset behaviour where counter gets
incremented only if hard reset succeeded.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 25c314aa)
Cc: stable@vger.kernel.org
parent 4c1a0fc2

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

+7 −2
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid, 
{

	unsigned long flags;

	ktime_t deadline;

	bool ret;



	if (unlikely(ring->adev->debug_disable_soft_recovery))

		return false;
@@ -441,12 +442,16 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid, 
		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)

		ring->funcs->soft_recovery(ring, vmid);



	return dma_fence_is_signaled(fence);

	ret = dma_fence_is_signaled(fence);

	/* increment the counter only if soft reset worked */

	if (ret)

		atomic_inc(&ring->adev->gpu_reset_counter);



	return ret;

}



/*