drm/amdgpu: use kernel fence interface when possible

Signed-off-by: monk.liu <monk.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
monk.liu
2015-07-30 14:56:18 +08:00
committed by Alex Deucher
parent 8128765ce5
commit 2e536084f2

View File

@@ -622,18 +622,11 @@ static long amdgpu_fence_wait_seq_timeout(struct amdgpu_device *adev,
*/ */
int amdgpu_fence_wait(struct amdgpu_fence *fence, bool intr) int amdgpu_fence_wait(struct amdgpu_fence *fence, bool intr)
{ {
uint64_t seq[AMDGPU_MAX_RINGS] = {};
long r; long r;
seq[fence->ring->idx] = fence->seq; r = fence_wait_timeout(&fence->base, intr, MAX_SCHEDULE_TIMEOUT);
r = amdgpu_fence_wait_seq_timeout(fence->ring->adev, seq, intr, MAX_SCHEDULE_TIMEOUT); if (r < 0)
if (r < 0) {
return r; return r;
}
r = fence_signal(&fence->base);
if (!r)
FENCE_TRACE(&fence->base, "signaled from fence_wait\n");
return 0; return 0;
} }