Commit fb5ce730 authored by Christian König's avatar Christian König
Browse files

dma-buf: rename and cleanup dma_resv_get_list v2 



When the comment needs to state explicitly that this is doesn't get a reference
to the object then the function is named rather badly.

Rename the function and use it in even more places.

v2: use dma_resv_shared_list as new name

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602111714.212426-5-christian.koenig@amd.com
parent 6edbd6ab

drivers/dma-buf/dma-resv.c

+16 −16
Original line number Diff line number Diff line
@@ -149,8 +149,7 @@ int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences) 


	dma_resv_assert_held(obj);



	old = dma_resv_get_list(obj);



	old = dma_resv_shared_list(obj);

	if (old && old->shared_max) {

		if ((old->shared_count + num_fences) <= old->shared_max)

			return 0;
@@ -219,12 +218,13 @@ EXPORT_SYMBOL(dma_resv_reserve_shared); 
 */

void dma_resv_reset_shared_max(struct dma_resv *obj)

{

	/* Test shared fence slot reservation */

	if (rcu_access_pointer(obj->fence)) {

		struct dma_resv_list *fence = dma_resv_get_list(obj);

	struct dma_resv_list *fences = dma_resv_shared_list(obj);



		fence->shared_max = fence->shared_count;

	}

	dma_resv_assert_held(obj);



	/* Test shared fence slot reservation */

	if (fences)

		fences->shared_max = fences->shared_count;

}

EXPORT_SYMBOL(dma_resv_reset_shared_max);

#endif
@@ -247,7 +247,7 @@ void dma_resv_add_shared_fence(struct dma_resv *obj, struct dma_fence *fence) 


	dma_resv_assert_held(obj);



	fobj = dma_resv_get_list(obj);

	fobj = dma_resv_shared_list(obj);

	count = fobj->shared_count;



	write_seqcount_begin(&obj->seq);
@@ -290,7 +290,7 @@ void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence) 


	dma_resv_assert_held(obj);



	old = dma_resv_get_list(obj);

	old = dma_resv_shared_list(obj);

	if (old)

		i = old->shared_count;
@@ -329,7 +329,7 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) 
	dma_resv_assert_held(dst);



	rcu_read_lock();

	src_list = rcu_dereference(src->fence);

	src_list = dma_resv_shared_list(src);



retry:

	if (src_list) {
@@ -342,7 +342,7 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) 
			return -ENOMEM;



		rcu_read_lock();

		src_list = rcu_dereference(src->fence);

		src_list = dma_resv_shared_list(src);

		if (!src_list || src_list->shared_count > shared_count) {

			kfree(dst_list);

			goto retry;
@@ -360,7 +360,7 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) 


			if (!dma_fence_get_rcu(fence)) {

				dma_resv_list_free(dst_list);

				src_list = rcu_dereference(src->fence);

				src_list = dma_resv_shared_list(src);

				goto retry;

			}
@@ -379,7 +379,7 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) 
	new = dma_fence_get_rcu_safe(&src->fence_excl);

	rcu_read_unlock();



	src_list = dma_resv_get_list(dst);

	src_list = dma_resv_shared_list(dst);

	old = dma_resv_excl_fence(dst);



	write_seqcount_begin(&dst->seq);
@@ -432,7 +432,7 @@ int dma_resv_get_fences_rcu(struct dma_resv *obj, 
		if (fence_excl && !dma_fence_get_rcu(fence_excl))

			goto unlock;



		fobj = rcu_dereference(obj->fence);

		fobj = dma_resv_shared_list(obj);

		if (fobj)

			sz += sizeof(*shared) * fobj->shared_max;
@@ -538,7 +538,7 @@ long dma_resv_wait_timeout_rcu(struct dma_resv *obj, 
	}



	if (wait_all) {

		struct dma_resv_list *fobj = rcu_dereference(obj->fence);

		struct dma_resv_list *fobj = dma_resv_shared_list(obj);



		if (fobj)

			shared_count = fobj->shared_count;
@@ -623,7 +623,7 @@ bool dma_resv_test_signaled_rcu(struct dma_resv *obj, bool test_all) 
	seq = read_seqcount_begin(&obj->seq);



	if (test_all) {

		struct dma_resv_list *fobj = rcu_dereference(obj->fence);

		struct dma_resv_list *fobj = dma_resv_shared_list(obj);

		unsigned int i;



		if (fobj)

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int amdgpu_amdkfd_remove_eviction_fence(struct amdgpu_bo *bo, 
	if (!ef)

		return -EINVAL;



	old = dma_resv_get_list(resv);

	old = dma_resv_shared_list(resv);

	if (!old)

		return 0;

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ __dma_resv_make_exclusive(struct dma_resv *obj) 
	unsigned int count;

	int r;



	if (!dma_resv_get_list(obj)) /* no shared fences to convert */

	if (!dma_resv_shared_list(obj)) /* no shared fences to convert */

		return 0;



	r = dma_resv_get_fences_rcu(obj, NULL, &count, &fences);

drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync, 
	f = dma_resv_excl_fence(resv);

	r = amdgpu_sync_fence(sync, f);



	flist = dma_resv_get_list(resv);

	flist = dma_resv_shared_list(resv);

	if (!flist || r)

		return r;

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -1339,7 +1339,7 @@ static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo, 
	 * If true, then return false as any KFD process needs all its BOs to

	 * be resident to run successfully

	 */

	flist = dma_resv_get_list(bo->base.resv);

	flist = dma_resv_shared_list(bo->base.resv);

	if (flist) {

		for (i = 0; i < flist->shared_count; ++i) {

			f = rcu_dereference_protected(flist->shared[i],