[PATCH v2] drm/amdgpu: Switch to interruptable wait to recover from ring hang.

[Christian König]

Am 30.04.2018 um 16:15 schrieb Andrey Grodzovsky:
> 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 at amd.com>
> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> index eb80edf..6741a62 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> @@ -421,9 +421,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) {
> -			DRM_ERROR("Error (%ld) waiting for fence!\n", r);
> +			if (r != -ERESTARTSYS)
> +				DRM_ERROR("Error (%ld) waiting for fence!\n", r);
> +
>   			return r;
>   		}
>   	}