Commit 6b41323a authored by Christian König's avatar Christian König

dma-buf: rename dma_resv_get_excl_rcu to _unlocked

That describes much better what the function is doing here.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJason Ekstrand <jason@jlekstrand.net>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602111714.212426-6-christian.koenig@amd.com
parent fb5ce730
...@@ -1375,7 +1375,7 @@ int drm_gem_fence_array_add_implicit(struct xarray *fence_array, ...@@ -1375,7 +1375,7 @@ int drm_gem_fence_array_add_implicit(struct xarray *fence_array,
if (!write) { if (!write) {
struct dma_fence *fence = 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); return drm_gem_fence_array_add(fence_array, fence);
} }
......
...@@ -147,7 +147,7 @@ int drm_gem_plane_helper_prepare_fb(struct drm_plane *plane, struct drm_plane_st ...@@ -147,7 +147,7 @@ int drm_gem_plane_helper_prepare_fb(struct drm_plane *plane, struct drm_plane_st
return 0; return 0;
obj = drm_gem_fb_get_obj(state->fb, 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); drm_atomic_set_fence_for_plane(state, fence);
return 0; return 0;
......
...@@ -195,7 +195,7 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit) ...@@ -195,7 +195,7 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit)
if (ret) if (ret)
return ret; return ret;
} else { } else {
bo->excl = dma_resv_get_excl_rcu(robj); bo->excl = dma_resv_get_excl_unlocked(robj);
} }
} }
......
...@@ -11040,7 +11040,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, ...@@ -11040,7 +11040,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
if (ret < 0) if (ret < 0)
goto unpin_fb; goto unpin_fb;
fence = dma_resv_get_excl_rcu(obj->base.resv); fence = dma_resv_get_excl_unlocked(obj->base.resv);
if (fence) { if (fence) {
add_rps_boost_after_vblank(new_plane_state->hw.crtc, add_rps_boost_after_vblank(new_plane_state->hw.crtc,
fence); fence);
......
...@@ -500,7 +500,7 @@ i915_gem_object_last_write_engine(struct drm_i915_gem_object *obj) ...@@ -500,7 +500,7 @@ i915_gem_object_last_write_engine(struct drm_i915_gem_object *obj)
struct dma_fence *fence; struct dma_fence *fence;
rcu_read_lock(); rcu_read_lock();
fence = dma_resv_get_excl_rcu(obj->base.resv); fence = dma_resv_get_excl_unlocked(obj->base.resv);
rcu_read_unlock(); rcu_read_unlock();
if (fence && dma_fence_is_i915(fence) && !dma_fence_is_signaled(fence)) if (fence && dma_fence_is_i915(fence) && !dma_fence_is_signaled(fence))
......
...@@ -73,7 +73,7 @@ i915_gem_object_wait_reservation(struct dma_resv *resv, ...@@ -73,7 +73,7 @@ i915_gem_object_wait_reservation(struct dma_resv *resv,
*/ */
prune_fences = count && timeout >= 0; prune_fences = count && timeout >= 0;
} else { } else {
excl = dma_resv_get_excl_rcu(resv); excl = dma_resv_get_excl_unlocked(resv);
} }
if (excl && timeout >= 0) if (excl && timeout >= 0)
...@@ -170,7 +170,7 @@ i915_gem_object_wait_priority(struct drm_i915_gem_object *obj, ...@@ -170,7 +170,7 @@ i915_gem_object_wait_priority(struct drm_i915_gem_object *obj,
kfree(shared); kfree(shared);
} else { } else {
excl = dma_resv_get_excl_rcu(obj->base.resv); excl = dma_resv_get_excl_unlocked(obj->base.resv);
} }
if (excl) { if (excl) {
......
...@@ -1611,7 +1611,7 @@ i915_request_await_object(struct i915_request *to, ...@@ -1611,7 +1611,7 @@ i915_request_await_object(struct i915_request *to,
dma_fence_put(shared[i]); dma_fence_put(shared[i]);
kfree(shared); kfree(shared);
} else { } else {
excl = dma_resv_get_excl_rcu(obj->base.resv); excl = dma_resv_get_excl_unlocked(obj->base.resv);
} }
if (excl) { if (excl) {
......
...@@ -606,7 +606,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, ...@@ -606,7 +606,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
dma_fence_put(shared[i]); dma_fence_put(shared[i]);
kfree(shared); kfree(shared);
} else { } else {
excl = dma_resv_get_excl_rcu(resv); excl = dma_resv_get_excl_unlocked(resv);
} }
if (ret >= 0 && excl && excl->ops != exclude) { if (ret >= 0 && excl && excl->ops != exclude) {
......
...@@ -561,7 +561,7 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) ...@@ -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->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; asyw->image.offset[0] = nvbo->offset;
if (wndw->func->prepare) { if (wndw->func->prepare) {
......
...@@ -203,7 +203,7 @@ static void panfrost_acquire_object_fences(struct drm_gem_object **bos, ...@@ -203,7 +203,7 @@ static void panfrost_acquire_object_fences(struct drm_gem_object **bos,
int i; int i;
for (i = 0; i < bo_count; 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, static void panfrost_attach_object_fences(struct drm_gem_object **bos,
......
...@@ -229,7 +229,7 @@ dma_resv_excl_fence(struct dma_resv *obj) ...@@ -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. * exclusive fence, without lock held.
* @obj: the reservation object * @obj: the reservation object
* *
...@@ -240,7 +240,7 @@ dma_resv_excl_fence(struct dma_resv *obj) ...@@ -240,7 +240,7 @@ dma_resv_excl_fence(struct dma_resv *obj)
* The exclusive fence or NULL if none * The exclusive fence or NULL if none
*/ */
static inline struct dma_fence * 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; struct dma_fence *fence;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment