| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Andrey Grodzovsky <andrey.grodzovsky@amd.com> |
| Date: Mon, 30 Apr 2018 10:04:42 -0400 |
| Subject: drm/amdgpu: Switch to interruptable wait to recover from ring hang. |
| |
| From: Andrey Grodzovsky <andrey.grodzovsky@amd.com> |
| |
| [ Upstream commit e6a5b9f9aee145c2f2c24431d84edfbb0d49eea5 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c |
| @@ -419,9 +419,11 @@ int amdgpu_ctx_wait_prev_fence(struct am |
| |
| 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; |
| } |
| } |