drm/amdgpu: switch to common fence_wait_any_timeout v2

No need to duplicate the functionality any more.

v2: fix handling if no fence is available.

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

1 files changed, 0 insertions, 98 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 663caa9d1175..c4bb28292b9f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -822,104 +822,6 @@ static const char *amdgpu_fence_get_timeline_name(struct fence *f)
         return (const char *)fence->ring->name;
 }
 
-static bool amdgpu_test_signaled_any(struct fence **fences, uint32_t count)
-{
-        int idx;
-        struct fence *fence;
-
-        for (idx = 0; idx < count; ++idx) {
-                fence = fences[idx];
-                if (fence) {
-                        if (test_bit(FENCE_FLAG_SIGNALED_BIT, &fence->flags))
-                                return true;
-                }
-        }
-        return false;
-}
-
-struct amdgpu_wait_cb {
-        struct fence_cb base;
-        struct task_struct *task;
-};
-
-static void amdgpu_fence_wait_cb(struct fence *fence, struct fence_cb *cb)
-{
-        struct amdgpu_wait_cb *wait =
-                container_of(cb, struct amdgpu_wait_cb, base);
-        wake_up_process(wait->task);
-}
-
-/**
- * Wait the fence array with timeout
- *
- * @array:    the fence array with amdgpu fence pointer
- * @count:    the number of the fence array
- * @intr:     when sleep, set the current task interruptable or not
- * @t:        timeout to wait
- *
- * It will return when any fence is signaled or timeout.
- */
-signed long amdgpu_fence_wait_any(struct fence **array, uint32_t count,
-                                  bool intr, signed long t)
-{
-        struct amdgpu_wait_cb *cb;
-        struct fence *fence;
-        unsigned idx;
-
-        BUG_ON(!array);
-
-        cb = kcalloc(count, sizeof(struct amdgpu_wait_cb), GFP_KERNEL);
-        if (cb == NULL) {
-                t = -ENOMEM;
-                goto err_free_cb;
-        }
-
-        for (idx = 0; idx < count; ++idx) {
-                fence = array[idx];
-                if (fence) {
-                        cb[idx].task = current;
-                        if (fence_add_callback(fence,
-                                        &cb[idx].base, amdgpu_fence_wait_cb)) {
-                                /* The fence is already signaled */
-                                goto fence_rm_cb;
-                        }
-                }
-        }
-
-        while (t > 0) {
-                if (intr)
-                        set_current_state(TASK_INTERRUPTIBLE);
-                else
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-
-                /*
-                 * amdgpu_test_signaled_any must be called after
-                 * set_current_state to prevent a race with wake_up_process
-                 */
-                if (amdgpu_test_signaled_any(array, count))
-                        break;
-
-                t = schedule_timeout(t);
-
-                if (t > 0 && intr && signal_pending(current))
-                        t = -ERESTARTSYS;
-        }
-
-        __set_current_state(TASK_RUNNING);
-
-fence_rm_cb:
-        for (idx = 0; idx < count; ++idx) {
-                fence = array[idx];
-                if (fence && cb[idx].base.func)
-                        fence_remove_callback(fence, &cb[idx].base);
-        }
-
-err_free_cb:
-        kfree(cb);
-
-        return t;
-}
-
 const struct fence_ops amdgpu_fence_ops = {
         .get_driver_name = amdgpu_fence_get_driver_name,
         .get_timeline_name = amdgpu_fence_get_timeline_name,