From: Jack Xiao Date: Thu, 4 Jun 2015 04:18:27 +0000 (+0800) Subject: drm/amdgpu: add zero timeout check in amdgpu_fence_wait_seq_timeout X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=25f45e633892a45df2edbfd4a5dbbfc70e32487b;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu: add zero timeout check in amdgpu_fence_wait_seq_timeout Signed-off-by: Jack Xiao Reviewed-by: Jammy Zhou --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index 9ce6023a4261..48ca637c5029 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c @@ -522,6 +522,10 @@ long amdgpu_fence_wait_seq_timeout(struct amdgpu_device *adev, u64 *target_seq, bool signaled; int i, r; + if (timeout == 0) { + return amdgpu_fence_any_seq_signaled(adev, target_seq); + } + while (!amdgpu_fence_any_seq_signaled(adev, target_seq)) { /* Save current sequence values, used to check for GPU lockups */