dma-buf: rename dma_resv_get_excl_rcu to _unlocked

That describes much better what the function is doing here.

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-6-christian.koenig@amd.com

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 9989425..263b4fb 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -1375,7 +1375,7 @@ int drm_gem_fence_array_add_implicit(struct xarray *fence_array,
 
        if (!write) {
                struct dma_fence *fence =
-                       dma_resv_get_excl_rcu(obj->resv);
+                       dma_resv_get_excl_unlocked(obj->resv);
 
                return drm_gem_fence_array_add(fence_array, fence);
        }

diff --git a/drivers/gpu/drm/drm_gem_atomic_helper.c b/drivers/gpu/drm/drm_gem_atomic_helper.c
index a005c5a..a271350 100644 (file)
--- a/drivers/gpu/drm/drm_gem_atomic_helper.c
+++ b/drivers/gpu/drm/drm_gem_atomic_helper.c
@@ -147,7 +147,7 @@ int drm_gem_plane_helper_prepare_fb(struct drm_plane *plane, struct drm_plane_st
                return 0;
 
        obj = drm_gem_fb_get_obj(state->fb, 0);
-       fence = dma_resv_get_excl_rcu(obj->resv);
+       fence = dma_resv_get_excl_unlocked(obj->resv);
        drm_atomic_set_fence_for_plane(state, fence);
 
        return 0;

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index d05c359..c942d2a 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -195,7 +195,7 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit)
                        if (ret)
                                return ret;
                } else {
-                       bo->excl = dma_resv_get_excl_rcu(robj);
+                       bo->excl = dma_resv_get_excl_unlocked(robj);
                }
 
        }

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 384ff0b..f17c5f5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -11040,7 +11040,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
                if (ret < 0)
                        goto unpin_fb;
 
-               fence = dma_resv_get_excl_rcu(obj->base.resv);
+               fence = dma_resv_get_excl_unlocked(obj->base.resv);
                if (fence) {
                        add_rps_boost_after_vblank(new_plane_state->hw.crtc,
                                                   fence);

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index 2ebd795..7c0eb42 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -500,7 +500,7 @@ i915_gem_object_last_write_engine(struct drm_i915_gem_object *obj)
        struct dma_fence *fence;
 
        rcu_read_lock();
-       fence = dma_resv_get_excl_rcu(obj->base.resv);
+       fence = dma_resv_get_excl_unlocked(obj->base.resv);
        rcu_read_unlock();
 
        if (fence && dma_fence_is_i915(fence) && !dma_fence_is_signaled(fence))

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
index 4b9856d..c13aedd 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
@@ -73,7 +73,7 @@ i915_gem_object_wait_reservation(struct dma_resv *resv,
                 */
                prune_fences = count && timeout >= 0;
        } else {
-               excl = dma_resv_get_excl_rcu(resv);
+               excl = dma_resv_get_excl_unlocked(resv);
        }
 
        if (excl && timeout >= 0)
@@ -170,7 +170,7 @@ i915_gem_object_wait_priority(struct drm_i915_gem_object *obj,
 
                kfree(shared);
        } else {
-               excl = dma_resv_get_excl_rcu(obj->base.resv);
+               excl = dma_resv_get_excl_unlocked(obj->base.resv);
        }
 
        if (excl) {

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index bec9c36..c85494f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -1611,7 +1611,7 @@ i915_request_await_object(struct i915_request *to,
                        dma_fence_put(shared[i]);
                kfree(shared);
        } else {
-               excl = dma_resv_get_excl_rcu(obj->base.resv);
+               excl = dma_resv_get_excl_unlocked(obj->base.resv);
        }
 
        if (excl) {

diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index 2744558..7aaf745 100644 (file)
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -606,7 +606,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
                        dma_fence_put(shared[i]);
                kfree(shared);
        } else {
-               excl = dma_resv_get_excl_rcu(resv);
+               excl = dma_resv_get_excl_unlocked(resv);
        }
 
        if (ret >= 0 && excl && excl->ops != exclude) {

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 0cb1f9d..8d048ba 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -561,7 +561,7 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state)
                        asyw->image.handle[0] = ctxdma->object.handle;
        }
 
-       asyw->state.fence = dma_resv_get_excl_rcu(nvbo->bo.base.resv);
+       asyw->state.fence = dma_resv_get_excl_unlocked(nvbo->bo.base.resv);
        asyw->image.offset[0] = nvbo->offset;
 
        if (wndw->func->prepare) {

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index 6003cfe..2df3e99 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -203,7 +203,7 @@ static void panfrost_acquire_object_fences(struct drm_gem_object **bos,
        int i;
 
        for (i = 0; i < bo_count; i++)
-               implicit_fences[i] = dma_resv_get_excl_rcu(bos[i]->resv);
+               implicit_fences[i] = dma_resv_get_excl_unlocked(bos[i]->resv);
 }
 
 static void panfrost_attach_object_fences(struct drm_gem_object **bos,

diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h
index 8dc19d6..3e0eefc 100644 (file)
--- a/include/linux/dma-resv.h
+++ b/include/linux/dma-resv.h
@@ -229,7 +229,7 @@ dma_resv_excl_fence(struct dma_resv *obj)
 }
 
 /**
- * dma_resv_get_excl_rcu - get the reservation object's
+ * dma_resv_get_excl_unlocked - get the reservation object's
  * exclusive fence, without lock held.
  * @obj: the reservation object
  *
@@ -240,7 +240,7 @@ dma_resv_excl_fence(struct dma_resv *obj)
  * The exclusive fence or NULL if none
  */
 static inline struct dma_fence *
-dma_resv_get_excl_rcu(struct dma_resv *obj)
+dma_resv_get_excl_unlocked(struct dma_resv *obj)
 {
        struct dma_fence *fence;