Re: [PATCH 6/7] dma-buf: rename dma_resv_get_excl_rcu to _unlocked

On Wed, Jun 02, 2021 at 01:17:13PM +0200, Christian König wrote:

That describes much better what the function is doing here.

Signed-off-by: Christian König christian.koenig@amd.com

Acked-by: Daniel Vetter daniel.vetter@ffwll.ch

---

drivers/gpu/drm/drm_gem.c | 2 +- drivers/gpu/drm/drm_gem_atomic_helper.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +- drivers/gpu/drm/i915/gem/i915_gem_wait.c | 4 ++-- drivers/gpu/drm/i915/i915_request.c | 2 +- drivers/gpu/drm/i915/i915_sw_fence.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- include/linux/dma-resv.h | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 9989425e9875..263b4fb03303 100644 --- 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 a005c5a0ba46..a27135084ae5 100644 --- 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 d05c35994579..c942d2a8c252 100644 --- 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 384ff0bb6e19..f17c5f54feb6 100644 --- 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 2ebd79537aea..7c0eb425cb3b 100644 --- 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 4b9856d5ba14..c13aeddf5aa7 100644 --- 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 bec9c3652188..c85494f411f4 100644 --- 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 2744558f3050..7aaf74552d06 100644 --- 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 0cb1f9d848d3..8d048bacd6f0 100644 --- 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 6003cfeb1322..2df3e999a38d 100644 --- 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 98ac66fecb71..f6b71712c029 100644 --- a/include/linux/dma-resv.h +++ b/include/linux/dma-resv.h @@ -228,7 +228,7 @@ dma_resv_exclusive(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

@@ -239,7 +239,7 @@ dma_resv_exclusive(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;

-- 2.25.1