diff options
| author | Andrey Grodzovsky <[email protected]> | 2018-04-30 14:04:42 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2018-05-15 18:44:18 +0000 |
| commit | 719a39a1e9b2dfbfb86f17a8da696b714a3b885d (patch) | |
| tree | 7742227f6aeb7f65ef7c6946c768c710528fd849 /drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | |
| parent | drm/ttm: Use GFP_TRANSHUGE_LIGHT for allocating huge pages (diff) | |
| download | kernel-719a39a1e9b2dfbfb86f17a8da696b714a3b885d.tar.gz kernel-719a39a1e9b2dfbfb86f17a8da696b714a3b885d.zip | |
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 <[email protected]>
Signed-off-by: Andrey Grodzovsky <[email protected]>
Reviewed-by: Christian König <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 |
1 files 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 eb80edfb1b0a..6741a62a7d15 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; } } |