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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 67d9277d616847d27a5aa815e2aaf9826a571fbf..4834725b627e63c57b533c4d15c411e8dfc1484b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -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)
 {
-       uint64_t seq[AMDGPU_MAX_RINGS] = {};
        long r;
 
-       seq[fence->ring->idx] = fence->seq;
-       r = amdgpu_fence_wait_seq_timeout(fence->ring->adev, seq, intr, MAX_SCHEDULE_TIMEOUT);
-       if (r < 0) {
-               return r;
-       }
-
-       r = fence_signal(&fence->base);
-       if (!r)
-               FENCE_TRACE(&fence->base, "signaled from fence_wait\n");
+       r = fence_wait_timeout(&fence->base, intr, MAX_SCHEDULE_TIMEOUT);
+       if (r < 0)
+               return  r;
        return 0;
 }