dma-buf: drop the _rcu postfix on function names v3

The functions can be called both in _rcu context as well
as while holding the lock.

v2: add some kerneldoc as suggested by Daniel
v3: fix indentation

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602111714.212426-7-christian.koenig@amd.com

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index d419cf9..511fe0d 100644 (file)
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -1147,8 +1147,7 @@ static int __dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
        long ret;
 
        /* Wait on any implicit rendering fences */
-       ret = dma_resv_wait_timeout_rcu(resv, write, true,
-                                                 MAX_SCHEDULE_TIMEOUT);
+       ret = dma_resv_wait_timeout(resv, write, true, MAX_SCHEDULE_TIMEOUT);
        if (ret < 0)
                return ret;
 

diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 62e7e05..f26c717 100644 (file)
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -396,7 +396,7 @@ retry:
 EXPORT_SYMBOL(dma_resv_copy_fences);
 
 /**
- * dma_resv_get_fences_rcu - Get an object's shared and exclusive
+ * dma_resv_get_fences - Get an object's shared and exclusive
  * fences without update side lock held
  * @obj: the reservation object
  * @pfence_excl: the returned exclusive fence (or NULL)
@@ -408,10 +408,9 @@ EXPORT_SYMBOL(dma_resv_copy_fences);
  * exclusive fence is not specified the fence is put into the array of the
  * shared fences as well. Returns either zero or -ENOMEM.
  */
-int dma_resv_get_fences_rcu(struct dma_resv *obj,
-                           struct dma_fence **pfence_excl,
-                           unsigned int *pshared_count,
-                           struct dma_fence ***pshared)
+int dma_resv_get_fences(struct dma_resv *obj, struct dma_fence **pfence_excl,
+                       unsigned int *pshared_count,
+                       struct dma_fence ***pshared)
 {
        struct dma_fence **shared = NULL;
        struct dma_fence *fence_excl;
@@ -494,23 +493,24 @@ unlock:
        *pshared = shared;
        return ret;
 }
-EXPORT_SYMBOL_GPL(dma_resv_get_fences_rcu);
+EXPORT_SYMBOL_GPL(dma_resv_get_fences);
 
 /**
- * dma_resv_wait_timeout_rcu - Wait on reservation's objects
+ * dma_resv_wait_timeout - Wait on reservation's objects
  * shared and/or exclusive fences.
  * @obj: the reservation object
  * @wait_all: if true, wait on all fences, else wait on just exclusive fence
  * @intr: if true, do interruptible wait
  * @timeout: timeout value in jiffies or zero to return immediately
  *
+ * Callers are not required to hold specific locks, but maybe hold
+ * dma_resv_lock() already
  * RETURNS
  * Returns -ERESTARTSYS if interrupted, 0 if the wait timed out, or
  * greater than zer on success.
  */
-long dma_resv_wait_timeout_rcu(struct dma_resv *obj,
-                              bool wait_all, bool intr,
-                              unsigned long timeout)
+long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr,
+                          unsigned long timeout)
 {
        long ret = timeout ? timeout : 1;
        unsigned int seq, shared_count;
@@ -582,7 +582,7 @@ unlock_retry:
        rcu_read_unlock();
        goto retry;
 }
-EXPORT_SYMBOL_GPL(dma_resv_wait_timeout_rcu);
+EXPORT_SYMBOL_GPL(dma_resv_wait_timeout);
 
 
 static inline int dma_resv_test_signaled_single(struct dma_fence *passed_fence)
@@ -602,16 +602,18 @@ static inline int dma_resv_test_signaled_single(struct dma_fence *passed_fence)
 }
 
 /**
- * dma_resv_test_signaled_rcu - Test if a reservation object's
- * fences have been signaled.
+ * dma_resv_test_signaled - Test if a reservation object's fences have been
+ * signaled.
  * @obj: the reservation object
  * @test_all: if true, test all fences, otherwise only test the exclusive
  * fence
  *
+ * Callers are not required to hold specific locks, but maybe hold
+ * dma_resv_lock() already
  * RETURNS
  * true if all fences signaled, else false
  */
-bool dma_resv_test_signaled_rcu(struct dma_resv *obj, bool test_all)
+bool dma_resv_test_signaled(struct dma_resv *obj, bool test_all)
 {
        unsigned int seq, shared_count;
        int ret;
@@ -660,7 +662,7 @@ retry:
        rcu_read_unlock();
        return ret;
 }
-EXPORT_SYMBOL_GPL(dma_resv_test_signaled_rcu);
+EXPORT_SYMBOL_GPL(dma_resv_test_signaled);
 
 #if IS_ENABLED(CONFIG_LOCKDEP)
 static int __init dma_resv_lockdep(void)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 49f73b5..ac7b37d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -203,9 +203,8 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc,
                goto unpin;
        }
 
-       r = dma_resv_get_fences_rcu(new_abo->tbo.base.resv, &work->excl,
-                                             &work->shared_count,
-                                             &work->shared);
+       r = dma_resv_get_fences(new_abo->tbo.base.resv, &work->excl,
+                               &work->shared_count, &work->shared);
        if (unlikely(r != 0)) {
                DRM_ERROR("failed to get fences for buffer\n");
                goto unpin;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
index 04caa31..c3053b8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -52,7 +52,7 @@ __dma_resv_make_exclusive(struct dma_resv *obj)
        if (!dma_resv_shared_list(obj)) /* no shared fences to convert */
                return 0;
 
-       r = dma_resv_get_fences_rcu(obj, NULL, &count, &fences);
+       r = dma_resv_get_fences(obj, NULL, &count, &fences);
        if (r)
                return r;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 7d5aaf5..1c3e3b6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -526,8 +526,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
                return -ENOENT;
        }
        robj = gem_to_amdgpu_bo(gobj);
-       ret = dma_resv_wait_timeout_rcu(robj->tbo.base.resv, true, true,
-                                                 timeout);
+       ret = dma_resv_wait_timeout(robj->tbo.base.resv, true, true, timeout);
 
        /* ret == 0 means not signaled,
         * ret > 0 means signaled

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
index b4971e9..df69b1e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
@@ -112,7 +112,7 @@ void amdgpu_pasid_free_delayed(struct dma_resv *resv,
        unsigned count;
        int r;
 
-       r = dma_resv_get_fences_rcu(resv, NULL, &count, &fences);
+       r = dma_resv_get_fences(resv, NULL, &count, &fences);
        if (r)
                goto fallback;
 
@@ -156,8 +156,7 @@ fallback:
        /* Not enough memory for the delayed delete, as last resort
         * block for all the fences to complete.
         */
-       dma_resv_wait_timeout_rcu(resv, true, false,
-                                           MAX_SCHEDULE_TIMEOUT);
+       dma_resv_wait_timeout(resv, true, false, MAX_SCHEDULE_TIMEOUT);
        amdgpu_pasid_free(pasid);
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
index 2741c28..d6c54c7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
@@ -75,8 +75,8 @@ static bool amdgpu_mn_invalidate_gfx(struct mmu_interval_notifier *mni,
 
        mmu_interval_set_seq(mni, cur_seq);
 
-       r = dma_resv_wait_timeout_rcu(bo->tbo.base.resv, true, false,
-                                     MAX_SCHEDULE_TIMEOUT);
+       r = dma_resv_wait_timeout(bo->tbo.base.resv, true, false,
+                                 MAX_SCHEDULE_TIMEOUT);
        mutex_unlock(&adev->notifier_lock);
        if (r <= 0)
                DRM_ERROR("(%ld) failed to wait for user bo\n", r);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 19c1384..96447e1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -756,8 +756,8 @@ int amdgpu_bo_kmap(struct amdgpu_bo *bo, void **ptr)
                return 0;
        }
 
-       r = dma_resv_wait_timeout_rcu(bo->tbo.base.resv, false, false,
-                                               MAX_SCHEDULE_TIMEOUT);
+       r = dma_resv_wait_timeout(bo->tbo.base.resv, false, false,
+                                 MAX_SCHEDULE_TIMEOUT);
        if (r < 0)
                return r;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 82f0542..a692a45 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -1126,9 +1126,8 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo,
        ib->length_dw = 16;
 
        if (direct) {
-               r = dma_resv_wait_timeout_rcu(bo->tbo.base.resv,
-                                                       true, false,
-                                                       msecs_to_jiffies(10));
+               r = dma_resv_wait_timeout(bo->tbo.base.resv, true, false,
+                                         msecs_to_jiffies(10));
                if (r == 0)
                        r = -ETIMEDOUT;
                if (r < 0)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index bcfd4a8..d1a2292 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2022,13 +2022,12 @@ static void amdgpu_vm_prt_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
        unsigned i, shared_count;
        int r;
 
-       r = dma_resv_get_fences_rcu(resv, &excl,
-                                             &shared_count, &shared);
+       r = dma_resv_get_fences(resv, &excl, &shared_count, &shared);
        if (r) {
                /* Not enough memory to grab the fence list, as last resort
                 * block for all the fences to complete.
                 */
-               dma_resv_wait_timeout_rcu(resv, true, false,
+               dma_resv_wait_timeout(resv, true, false,
                                                    MAX_SCHEDULE_TIMEOUT);
                return;
        }
@@ -2640,7 +2639,7 @@ bool amdgpu_vm_evictable(struct amdgpu_bo *bo)
                return true;
 
        /* Don't evict VM page tables while they are busy */
-       if (!dma_resv_test_signaled_rcu(bo->tbo.base.resv, true))
+       if (!dma_resv_test_signaled(bo->tbo.base.resv, true))
                return false;
 
        /* Try to block ongoing updates */
@@ -2820,8 +2819,8 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
  */
 long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout)
 {
-       timeout = dma_resv_wait_timeout_rcu(vm->root.base.bo->tbo.base.resv,
-                                           true, true, timeout);
+       timeout = dma_resv_wait_timeout(vm->root.base.bo->tbo.base.resv, true,
+                                       true, timeout);
        if (timeout <= 0)
                return timeout;
 

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 3267eb2..6dde287 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -8400,9 +8400,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
                 * deadlock during GPU reset when this fence will not signal
                 * but we hold reservation lock for the BO.
                 */
-               r = dma_resv_wait_timeout_rcu(abo->tbo.base.resv, true,
-                                                       false,
-                                                       msecs_to_jiffies(5000));
+               r = dma_resv_wait_timeout(abo->tbo.base.resv, true, false,
+                                         msecs_to_jiffies(5000));
                if (unlikely(r <= 0))
                        DRM_ERROR("Waiting for fences timed out!");
 

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 263b4fb..d62fb1a 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -770,8 +770,7 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
                return -EINVAL;
        }
 
-       ret = dma_resv_wait_timeout_rcu(obj->resv, wait_all,
-                                                 true, timeout);
+       ret = dma_resv_wait_timeout(obj->resv, wait_all, true, timeout);
        if (ret == 0)
                ret = -ETIME;
        else if (ret > 0)
@@ -1380,7 +1379,7 @@ int drm_gem_fence_array_add_implicit(struct xarray *fence_array,
                return drm_gem_fence_array_add(fence_array, fence);
        }
 
-       ret = dma_resv_get_fences_rcu(obj->resv, NULL,
+       ret = dma_resv_get_fences(obj->resv, NULL,
                                                &fence_count, &fences);
        if (ret || !fence_count)
                return ret;

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 8792d8d..b8fa6ed 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -390,14 +390,12 @@ int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op,
        }
 
        if (op & ETNA_PREP_NOSYNC) {
-               if (!dma_resv_test_signaled_rcu(obj->resv,
-                                                         write))
+               if (!dma_resv_test_signaled(obj->resv, write))
                        return -EBUSY;
        } else {
                unsigned long remain = etnaviv_timeout_to_jiffies(timeout);
 
-               ret = dma_resv_wait_timeout_rcu(obj->resv,
-                                                         write, true, remain);
+               ret = dma_resv_wait_timeout(obj->resv, write, true, remain);
                if (ret <= 0)
                        return ret == 0 ? -ETIMEDOUT : ret;
        }

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index c942d2a..d53856d 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -189,9 +189,9 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit)
                        continue;
 
                if (bo->flags & ETNA_SUBMIT_BO_WRITE) {
-                       ret = dma_resv_get_fences_rcu(robj, &bo->excl,
-                                                               &bo->nr_shared,
-                                                               &bo->shared);
+                       ret = dma_resv_get_fences(robj, &bo->excl,
+                                                 &bo->nr_shared,
+                                                 &bo->shared);
                        if (ret)
                                return ret;
                } else {

diff --git a/drivers/gpu/drm/i915/dma_resv_utils.c b/drivers/gpu/drm/i915/dma_resv_utils.c
index 9e508e7..7df91b7 100644 (file)
--- a/drivers/gpu/drm/i915/dma_resv_utils.c
+++ b/drivers/gpu/drm/i915/dma_resv_utils.c
@@ -10,7 +10,7 @@
 void dma_resv_prune(struct dma_resv *resv)
 {
        if (dma_resv_trylock(resv)) {
-               if (dma_resv_test_signaled_rcu(resv, true))
+               if (dma_resv_test_signaled(resv, true))
                        dma_resv_add_excl_fence(resv, NULL);
                dma_resv_unlock(resv);
        }

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_busy.c b/drivers/gpu/drm/i915/gem/i915_gem_busy.c
index 35279dd..6234e17 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_busy.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_busy.c
@@ -105,7 +105,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
         * Alternatively, we can trade that extra information on read/write
         * activity with
         *      args->busy =
-        *              !dma_resv_test_signaled_rcu(obj->resv, true);
+        *              !dma_resv_test_signaled(obj->resv, true);
         * to report the overall busyness. This is what the wait-ioctl does.
         *
         */

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 2971435..6678911 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1481,7 +1481,7 @@ static inline bool use_reloc_gpu(struct i915_vma *vma)
        if (DBG_FORCE_RELOC)
                return false;
 
-       return !dma_resv_test_signaled_rcu(vma->resv, true);
+       return !dma_resv_test_signaled(vma->resv, true);
 }
 
 static unsigned long vma_phys_addr(struct i915_vma *vma, u32 offset)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index a657b99..b5cbbe6 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -85,8 +85,8 @@ static bool i915_gem_userptr_invalidate(struct mmu_interval_notifier *mni,
                return true;
 
        /* we will unbind on next submission, still have userptr pins */
-       r = dma_resv_wait_timeout_rcu(obj->base.resv, true, false,
-                                     MAX_SCHEDULE_TIMEOUT);
+       r = dma_resv_wait_timeout(obj->base.resv, true, false,
+                                 MAX_SCHEDULE_TIMEOUT);
        if (r <= 0)
                drm_err(&i915->drm, "(%ld) failed to wait for idle\n", r);
 

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
index c13aedd..1e97520 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
@@ -45,7 +45,7 @@ i915_gem_object_wait_reservation(struct dma_resv *resv,
                unsigned int count, i;
                int ret;
 
-               ret = dma_resv_get_fences_rcu(resv, &excl, &count, &shared);
+               ret = dma_resv_get_fences(resv, &excl, &count, &shared);
                if (ret)
                        return ret;
 
@@ -158,8 +158,8 @@ i915_gem_object_wait_priority(struct drm_i915_gem_object *obj,
                unsigned int count, i;
                int ret;
 
-               ret = dma_resv_get_fences_rcu(obj->base.resv,
-                                             &excl, &count, &shared);
+               ret = dma_resv_get_fences(obj->base.resv, &excl, &count,
+                                         &shared);
                if (ret)
                        return ret;
 

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index c85494f..6cb91f0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -1594,8 +1594,8 @@ i915_request_await_object(struct i915_request *to,
                struct dma_fence **shared;
                unsigned int count, i;
 
-               ret = dma_resv_get_fences_rcu(obj->base.resv,
-                                                       &excl, &count, &shared);
+               ret = dma_resv_get_fences(obj->base.resv, &excl, &count,
+                                         &shared);
                if (ret)
                        return ret;
 

diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index 7aaf745..c589a68 100644 (file)
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -582,7 +582,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
                struct dma_fence **shared;
                unsigned int count, i;
 
-               ret = dma_resv_get_fences_rcu(resv, &excl, &count, &shared);
+               ret = dma_resv_get_fences(resv, &excl, &count, &shared);
                if (ret)
                        return ret;
 

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 410a93a..a94a43d 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -915,8 +915,7 @@ int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout)
                op & MSM_PREP_NOSYNC ? 0 : timeout_to_jiffies(timeout);
        long ret;
 
-       ret = dma_resv_wait_timeout_rcu(obj->resv, write,
-                                                 true,  remain);
+       ret = dma_resv_wait_timeout(obj->resv, write, true,  remain);
        if (ret == 0)
                return remain == 0 ? -EBUSY : -ETIMEDOUT;
        else if (ret < 0)

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index d863e5e..5b27845 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -964,8 +964,8 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
                return -ENOENT;
        nvbo = nouveau_gem_object(gem);
 
-       lret = dma_resv_wait_timeout_rcu(nvbo->bo.base.resv, write, true,
-                                                  no_wait ? 0 : 30 * HZ);
+       lret = dma_resv_wait_timeout(nvbo->bo.base.resv, write, true,
+                                    no_wait ? 0 : 30 * HZ);
        if (!lret)
                ret = -EBUSY;
        else if (lret > 0)

diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 1596559..075ec0e 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -312,8 +312,7 @@ panfrost_ioctl_wait_bo(struct drm_device *dev, void *data,
        if (!gem_obj)
                return -ENOENT;
 
-       ret = dma_resv_wait_timeout_rcu(gem_obj->resv, true,
-                                                 true, timeout);
+       ret = dma_resv_wait_timeout(gem_obj->resv, true, true, timeout);
        if (!ret)
                ret = timeout ? -ETIMEDOUT : -EBUSY;
 

diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 3272c33..458f92a 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -161,7 +161,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj,
        }
        if (domain == RADEON_GEM_DOMAIN_CPU) {
                /* Asking for cpu access wait for object idle */
-               r = dma_resv_wait_timeout_rcu(robj->tbo.base.resv, true, true, 30 * HZ);
+               r = dma_resv_wait_timeout(robj->tbo.base.resv, true, true, 30 * HZ);
                if (!r)
                        r = -EBUSY;
 
@@ -523,7 +523,7 @@ int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
        }
        robj = gem_to_radeon_bo(gobj);
 
-       r = dma_resv_test_signaled_rcu(robj->tbo.base.resv, true);
+       r = dma_resv_test_signaled(robj->tbo.base.resv, true);
        if (r == 0)
                r = -EBUSY;
        else
@@ -552,7 +552,7 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
        }
        robj = gem_to_radeon_bo(gobj);
 
-       ret = dma_resv_wait_timeout_rcu(robj->tbo.base.resv, true, true, 30 * HZ);
+       ret = dma_resv_wait_timeout(robj->tbo.base.resv, true, true, 30 * HZ);
        if (ret == 0)
                r = -EBUSY;
        else if (ret < 0)

diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
index e37c9a5..9fa8854 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_mn.c
+++ b/drivers/gpu/drm/radeon/radeon_mn.c
@@ -66,8 +66,8 @@ static bool radeon_mn_invalidate(struct mmu_interval_notifier *mn,
                return true;
        }
 
-       r = dma_resv_wait_timeout_rcu(bo->tbo.base.resv, true, false,
-                                     MAX_SCHEDULE_TIMEOUT);
+       r = dma_resv_wait_timeout(bo->tbo.base.resv, true, false,
+                                 MAX_SCHEDULE_TIMEOUT);
        if (r <= 0)
                DRM_ERROR("(%ld) failed to wait for user bo\n", r);
 

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index f04a269..7e7284d 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -296,7 +296,7 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo,
        struct dma_resv *resv = &bo->base._resv;
        int ret;
 
-       if (dma_resv_test_signaled_rcu(resv, true))
+       if (dma_resv_test_signaled(resv, true))
                ret = 0;
        else
                ret = -EBUSY;
@@ -308,8 +308,8 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo,
                        dma_resv_unlock(bo->base.resv);
                spin_unlock(&bo->bdev->lru_lock);
 
-               lret = dma_resv_wait_timeout_rcu(resv, true, interruptible,
-                                                30 * HZ);
+               lret = dma_resv_wait_timeout(resv, true, interruptible,
+                                            30 * HZ);
 
                if (lret < 0)
                        return lret;
@@ -411,8 +411,8 @@ static void ttm_bo_release(struct kref *kref)
                        /* Last resort, if we fail to allocate memory for the
                         * fences block for the BO to become idle
                         */
-                       dma_resv_wait_timeout_rcu(bo->base.resv, true, false,
-                                                 30 * HZ);
+                       dma_resv_wait_timeout(bo->base.resv, true, false,
+                                             30 * HZ);
                }
 
                if (bo->bdev->funcs->release_notify)
@@ -422,7 +422,7 @@ static void ttm_bo_release(struct kref *kref)
                ttm_mem_io_free(bdev, bo->resource);
        }
 
-       if (!dma_resv_test_signaled_rcu(bo->base.resv, true) ||
+       if (!dma_resv_test_signaled(bo->base.resv, true) ||
            !dma_resv_trylock(bo->base.resv)) {
                /* The BO is not idle, resurrect it for delayed destroy */
                ttm_bo_flush_all_fences(bo);
@@ -1094,14 +1094,14 @@ int ttm_bo_wait(struct ttm_buffer_object *bo,
        long timeout = 15 * HZ;
 
        if (no_wait) {
-               if (dma_resv_test_signaled_rcu(bo->base.resv, true))
+               if (dma_resv_test_signaled(bo->base.resv, true))
                        return 0;
                else
                        return -EBUSY;
        }
 
-       timeout = dma_resv_wait_timeout_rcu(bo->base.resv, true,
-                                                     interruptible, timeout);
+       timeout = dma_resv_wait_timeout(bo->base.resv, true, interruptible,
+                                       timeout);
        if (timeout < 0)
                return timeout;
 

diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c
index 2902dc6..bd6f752 100644 (file)
--- a/drivers/gpu/drm/vgem/vgem_fence.c
+++ b/drivers/gpu/drm/vgem/vgem_fence.c
@@ -151,8 +151,7 @@ int vgem_fence_attach_ioctl(struct drm_device *dev,
 
        /* Check for a conflicting fence */
        resv = obj->resv;
-       if (!dma_resv_test_signaled_rcu(resv,
-                                                 arg->flags & VGEM_FENCE_WRITE)) {
+       if (!dma_resv_test_signaled(resv, arg->flags & VGEM_FENCE_WRITE)) {
                ret = -EBUSY;
                goto err_fence;
        }

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 669f2ee..5c1ad15 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -451,10 +451,9 @@ static int virtio_gpu_wait_ioctl(struct drm_device *dev, void *data,
                return -ENOENT;
 
        if (args->flags & VIRTGPU_WAIT_NOWAIT) {
-               ret = dma_resv_test_signaled_rcu(obj->resv, true);
+               ret = dma_resv_test_signaled(obj->resv, true);
        } else {
-               ret = dma_resv_wait_timeout_rcu(obj->resv, true, true,
-                                               timeout);
+               ret = dma_resv_wait_timeout(obj->resv, true, true, timeout);
        }
        if (ret == 0)
                ret = -EBUSY;

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
index 176b620..362f56d 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
@@ -743,9 +743,9 @@ static int vmw_user_bo_synccpu_grab(struct vmw_user_buffer_object *user_bo,
        if (flags & drm_vmw_synccpu_allow_cs) {
                long lret;
 
-               lret = dma_resv_wait_timeout_rcu
-                       (bo->base.resv, true, true,
-                        nonblock ? 0 : MAX_SCHEDULE_TIMEOUT);
+               lret = dma_resv_wait_timeout(bo->base.resv, true, true,
+                                            nonblock ? 0 :
+                                            MAX_SCHEDULE_TIMEOUT);
                if (!lret)
                        return -EBUSY;
                else if (lret < 0)

diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h
index 3e0eefc..562b885 100644 (file)
--- a/include/linux/dma-resv.h
+++ b/include/linux/dma-resv.h
@@ -271,19 +271,12 @@ void dma_resv_init(struct dma_resv *obj);
 void dma_resv_fini(struct dma_resv *obj);
 int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences);
 void dma_resv_add_shared_fence(struct dma_resv *obj, struct dma_fence *fence);
-
 void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence);
-
-int dma_resv_get_fences_rcu(struct dma_resv *obj,
-                           struct dma_fence **pfence_excl,
-                           unsigned *pshared_count,
-                           struct dma_fence ***pshared);
-
+int dma_resv_get_fences(struct dma_resv *obj, struct dma_fence **pfence_excl,
+                       unsigned *pshared_count, struct dma_fence ***pshared);
 int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src);
-
-long dma_resv_wait_timeout_rcu(struct dma_resv *obj, bool wait_all, bool intr,
-                              unsigned long timeout);
-
-bool dma_resv_test_signaled_rcu(struct dma_resv *obj, bool test_all);
+long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr,
+                          unsigned long timeout);
+bool dma_resv_test_signaled(struct dma_resv *obj, bool test_all);
 
 #endif /* _LINUX_RESERVATION_H */