Skip to content

Commit 6b41323

Browse files
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 <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Acked-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent fb5ce73 commit 6b41323

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

drivers/gpu/drm/drm_gem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ int drm_gem_fence_array_add_implicit(struct xarray *fence_array,
13751375

13761376
if (!write) {
13771377
struct dma_fence *fence =
1378-
dma_resv_get_excl_rcu(obj->resv);
1378+
dma_resv_get_excl_unlocked(obj->resv);
13791379

13801380
return drm_gem_fence_array_add(fence_array, fence);
13811381
}

drivers/gpu/drm/drm_gem_atomic_helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ int drm_gem_plane_helper_prepare_fb(struct drm_plane *plane, struct drm_plane_st
147147
return 0;
148148

149149
obj = drm_gem_fb_get_obj(state->fb, 0);
150-
fence = dma_resv_get_excl_rcu(obj->resv);
150+
fence = dma_resv_get_excl_unlocked(obj->resv);
151151
drm_atomic_set_fence_for_plane(state, fence);
152152

153153
return 0;

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit)
195195
if (ret)
196196
return ret;
197197
} else {
198-
bo->excl = dma_resv_get_excl_rcu(robj);
198+
bo->excl = dma_resv_get_excl_unlocked(robj);
199199
}
200200

201201
}

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11040,7 +11040,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
1104011040
if (ret < 0)
1104111041
goto unpin_fb;
1104211042

11043-
fence = dma_resv_get_excl_rcu(obj->base.resv);
11043+
fence = dma_resv_get_excl_unlocked(obj->base.resv);
1104411044
if (fence) {
1104511045
add_rps_boost_after_vblank(new_plane_state->hw.crtc,
1104611046
fence);

drivers/gpu/drm/i915/gem/i915_gem_object.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ i915_gem_object_last_write_engine(struct drm_i915_gem_object *obj)
500500
struct dma_fence *fence;
501501

502502
rcu_read_lock();
503-
fence = dma_resv_get_excl_rcu(obj->base.resv);
503+
fence = dma_resv_get_excl_unlocked(obj->base.resv);
504504
rcu_read_unlock();
505505

506506
if (fence && dma_fence_is_i915(fence) && !dma_fence_is_signaled(fence))

drivers/gpu/drm/i915/gem/i915_gem_wait.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ i915_gem_object_wait_reservation(struct dma_resv *resv,
7373
*/
7474
prune_fences = count && timeout >= 0;
7575
} else {
76-
excl = dma_resv_get_excl_rcu(resv);
76+
excl = dma_resv_get_excl_unlocked(resv);
7777
}
7878

7979
if (excl && timeout >= 0)
@@ -170,7 +170,7 @@ i915_gem_object_wait_priority(struct drm_i915_gem_object *obj,
170170

171171
kfree(shared);
172172
} else {
173-
excl = dma_resv_get_excl_rcu(obj->base.resv);
173+
excl = dma_resv_get_excl_unlocked(obj->base.resv);
174174
}
175175

176176
if (excl) {

drivers/gpu/drm/i915/i915_request.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@ i915_request_await_object(struct i915_request *to,
16111611
dma_fence_put(shared[i]);
16121612
kfree(shared);
16131613
} else {
1614-
excl = dma_resv_get_excl_rcu(obj->base.resv);
1614+
excl = dma_resv_get_excl_unlocked(obj->base.resv);
16151615
}
16161616

16171617
if (excl) {

drivers/gpu/drm/i915/i915_sw_fence.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
606606
dma_fence_put(shared[i]);
607607
kfree(shared);
608608
} else {
609-
excl = dma_resv_get_excl_rcu(resv);
609+
excl = dma_resv_get_excl_unlocked(resv);
610610
}
611611

612612
if (ret >= 0 && excl && excl->ops != exclude) {

drivers/gpu/drm/nouveau/dispnv50/wndw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state)
561561
asyw->image.handle[0] = ctxdma->object.handle;
562562
}
563563

564-
asyw->state.fence = dma_resv_get_excl_rcu(nvbo->bo.base.resv);
564+
asyw->state.fence = dma_resv_get_excl_unlocked(nvbo->bo.base.resv);
565565
asyw->image.offset[0] = nvbo->offset;
566566

567567
if (wndw->func->prepare) {

drivers/gpu/drm/panfrost/panfrost_job.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static void panfrost_acquire_object_fences(struct drm_gem_object **bos,
203203
int i;
204204

205205
for (i = 0; i < bo_count; i++)
206-
implicit_fences[i] = dma_resv_get_excl_rcu(bos[i]->resv);
206+
implicit_fences[i] = dma_resv_get_excl_unlocked(bos[i]->resv);
207207
}
208208

209209
static void panfrost_attach_object_fences(struct drm_gem_object **bos,

include/linux/dma-resv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ dma_resv_excl_fence(struct dma_resv *obj)
229229
}
230230

231231
/**
232-
* dma_resv_get_excl_rcu - get the reservation object's
232+
* dma_resv_get_excl_unlocked - get the reservation object's
233233
* exclusive fence, without lock held.
234234
* @obj: the reservation object
235235
*
@@ -240,7 +240,7 @@ dma_resv_excl_fence(struct dma_resv *obj)
240240
* The exclusive fence or NULL if none
241241
*/
242242
static inline struct dma_fence *
243-
dma_resv_get_excl_rcu(struct dma_resv *obj)
243+
dma_resv_get_excl_unlocked(struct dma_resv *obj)
244244
{
245245
struct dma_fence *fence;
246246

0 commit comments

Comments
 (0)