Commit e6a5b9f9 authored Apr 30, 2018 by Andrey Grodzovsky Committed by Alex Deucher May 09, 2018

drm/amdgpu: Switch to interruptable wait to recover from ring hang.



v2:
Use dma_fence_wait instead of dma_fence_wait_timeout(...,MAX_SCHEDULE_TIMEOUT)
Avoid printing error message for ERESTARTSYS

Originally-by: David Panariti <David.Panariti@amd.com>
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent da291320

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -419,9 +419,11 @@ int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx, unsigned ring_id)

		if (other) {
		signed long r;
		r = dma_fence_wait_timeout(other, false, MAX_SCHEDULE_TIMEOUT);
		r = dma_fence_wait(other, true);
		if (r < 0) {
		if (r != -ERESTARTSYS)
		DRM_ERROR("Error (%ld) waiting for fence!\n", r);

		return r;
		}
		}