drm/amdgpu: remove amdgpu_fence_wait

It was just a wrapper for fence_wait anyway.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index abf1650f6936582c2fe8bcbfadc55dabd1112719..7a3a00fd339ce4e8375ad637297c5526378b7007 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -439,7 +439,6 @@ int amdgpu_fence_wait_next(struct amdgpu_ring *ring);
 int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);
 unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring);
 
-int amdgpu_fence_wait(struct amdgpu_fence *fence, bool interruptible);
 signed long amdgpu_fence_wait_any(struct amdgpu_device *adev,
                          struct amdgpu_fence **fences,
                          bool intr, long t);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c
index 2742b9a35cbcb5d217ba2adb273ba260ec983b27..759482e4300d186d7691793ac4d41678629fb972 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c
@@ -42,7 +42,7 @@ static int amdgpu_benchmark_do_move(struct amdgpu_device *adev, unsigned size,
                r = amdgpu_copy_buffer(ring, saddr, daddr, size, NULL, &fence);
                if (r)
                        goto exit_do_move;
-               r = amdgpu_fence_wait(fence, false);
+               r = fence_wait(&fence->base, false);
                if (r)
                        goto exit_do_move;
                amdgpu_fence_unref(&fence);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index b16b9256883e3dd3c66d9e42184f42f304230c72..e12931ea66e4e3047c44c73782255ac539d149de 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -52,7 +52,7 @@ static void amdgpu_flip_work_func(struct work_struct *__work)
        if (work->fence) {
                fence = to_amdgpu_fence(work->fence);
                if (fence) {
-                       r = amdgpu_fence_wait(fence, false);
+                       r = fence_wait(&fence->base, false);
                        if (r == -EDEADLK) {
                                up_read(&adev->exclusive_lock);
                                r = amdgpu_gpu_reset(adev);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 5a2a15cf1a7c1ab65db1b560fbcbafb9841bde79..1097259df3c2adc35db8ce4317c44a0fd53ec333 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -497,28 +497,6 @@ static long amdgpu_fence_ring_wait_seq_timeout(struct amdgpu_ring *ring, uint64_
        }
 }
 
-
-/**
- * amdgpu_fence_wait - wait for a fence to signal
- *
- * @fence: amdgpu fence object
- * @intr: use interruptable sleep
- *
- * Wait for the requested fence to signal (all asics).
- * @intr selects whether to use interruptable (true) or non-interruptable
- * (false) sleep when waiting for the fence.
- * Returns 0 if the fence has passed, error for all other cases.
- */
-int amdgpu_fence_wait(struct amdgpu_fence *fence, bool intr)
-{
-       long r;
-
-       r = fence_wait_timeout(&fence->base, intr, MAX_SCHEDULE_TIMEOUT);
-       if (r < 0)
-               return  r;
-       return 0;
-}
-
 /**
  * amdgpu_fence_wait_next - wait for the next fence to signal
  *

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index 2c42f50912b98f7f3305528888f9eb248641b04b..7cb711fc1ee29490df558cc60cdc5a278d6ef135 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -180,7 +180,7 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync,
 
                if (amdgpu_enable_scheduler || (count >= AMDGPU_NUM_SYNCS)) {
                        /* not enough room, wait manually */
-                       r = amdgpu_fence_wait(fence, false);
+                       r = fence_wait(&fence->base, false);
                        if (r)
                                return r;
                        continue;
@@ -200,7 +200,7 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync,
                if (!amdgpu_semaphore_emit_signal(other, semaphore)) {
                        /* signaling wasn't successful wait manually */
                        amdgpu_ring_undo(other);
-                       r = amdgpu_fence_wait(fence, false);
+                       r = fence_wait(&fence->base, false);
                        if (r)
                                return r;
                        continue;
@@ -210,7 +210,7 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync,
                if (!amdgpu_semaphore_emit_wait(ring, semaphore)) {
                        /* waiting wasn't successful wait manually */
                        amdgpu_ring_undo(other);
-                       r = amdgpu_fence_wait(fence, false);
+                       r = fence_wait(&fence->base, false);
                        if (r)
                                return r;
                        continue;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index afb57de1652187cc8905ecae89aa59e3314add45..962dd555213753b56bfe5817b795127692a867c2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -116,7 +116,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                        goto out_lclean_unpin;
                }
 
-               r = amdgpu_fence_wait(fence, false);
+               r = fence_wait(&fence->base, false);
                if (r) {
                        DRM_ERROR("Failed to wait for GTT->VRAM fence %d\n", i);
                        goto out_lclean_unpin;
@@ -161,7 +161,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                        goto out_lclean_unpin;
                }
 
-               r = amdgpu_fence_wait(fence, false);
+               r = fence_wait(&fence->base, false);
                if (r) {
                        DRM_ERROR("Failed to wait for VRAM->GTT fence %d\n", i);
                        goto out_lclean_unpin;