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

dma-buf/sync_file: cleanup fence merging a bit 



krealloc_array() ignores attempts to reduce the array size, so the attempt
to save memory is completely pointless here.

Also move testing for the no fence case into sync_file_set_fence(), this
way we don't even touch the fence array when we don't have any fences.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220426124637.329764-1-christian.koenig@amd.com
parent d7442505

drivers/dma-buf/sync_file.c

+7 −14
Original line number Diff line number Diff line
@@ -157,9 +157,15 @@ static int sync_file_set_fence(struct sync_file *sync_file, 
	 * we already own a new reference to the fence. For num_fence > 1

	 * we own the reference of the dma_fence_array creation.

	 */

	if (num_fences == 1) {



	if (num_fences == 0) {

		sync_file->fence = dma_fence_get_stub();

		kfree(fences);



	} else if (num_fences == 1) {

		sync_file->fence = fences[0];

		kfree(fences);



	} else {

		array = dma_fence_array_create(num_fences, fences,

					       dma_fence_context_alloc(1),
@@ -261,19 +267,6 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, 
		}

	}



	if (index == 0)

		fences[index++] = dma_fence_get_stub();



	if (num_fences > index) {

		struct dma_fence **tmp;



		/* Keep going even when reducing the size failed */

		tmp = krealloc_array(fences, index, sizeof(*fences),

				     GFP_KERNEL);

		if (tmp)

			fences = tmp;

	}



	if (sync_file_set_fence(sync_file, fences, index) < 0)

		goto err_put_fences;