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

dma-buf: cleanup dma_fence_unwrap implementation 



Move the code from the inline functions into exported functions.

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/20220518135844.3338-3-christian.koenig@amd.com
parent 0c5064fa

drivers/dma-buf/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \

	 dma-resv.o

	 dma-fence-unwrap.o dma-resv.o

obj-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o

obj-$(CONFIG_DMABUF_HEAPS)	+= heaps/

obj-$(CONFIG_SYNC_FILE)		+= sync_file.o

drivers/dma-buf/dma-fence-unwrap.c

0 → 100644
+59 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * dma-fence-util: misc functions for dma_fence objects

 *

 * Copyright (C) 2022 Advanced Micro Devices, Inc.

 * Authors:

 *	Christian König <christian.koenig@amd.com>

 */



#include <linux/dma-fence.h>

#include <linux/dma-fence-array.h>

#include <linux/dma-fence-chain.h>

#include <linux/dma-fence-unwrap.h>



/* Internal helper to start new array iteration, don't use directly */

static struct dma_fence *

__dma_fence_unwrap_array(struct dma_fence_unwrap *cursor)

{

	cursor->array = dma_fence_chain_contained(cursor->chain);

	cursor->index = 0;

	return dma_fence_array_first(cursor->array);

}



/**

 * dma_fence_unwrap_first - return the first fence from fence containers

 * @head: the entrypoint into the containers

 * @cursor: current position inside the containers

 *

 * Unwraps potential dma_fence_chain/dma_fence_array containers and return the

 * first fence.

 */

struct dma_fence *dma_fence_unwrap_first(struct dma_fence *head,

					 struct dma_fence_unwrap *cursor)

{

	cursor->chain = dma_fence_get(head);

	return __dma_fence_unwrap_array(cursor);

}

EXPORT_SYMBOL_GPL(dma_fence_unwrap_first);



/**

 * dma_fence_unwrap_next - return the next fence from a fence containers

 * @cursor: current position inside the containers

 *

 * Continue unwrapping the dma_fence_chain/dma_fence_array containers and return

 * the next fence from them.

 */

struct dma_fence *dma_fence_unwrap_next(struct dma_fence_unwrap *cursor)

{

	struct dma_fence *tmp;



	++cursor->index;

	tmp = dma_fence_array_next(cursor->array, cursor->index);

	if (tmp)

		return tmp;



	cursor->chain = dma_fence_chain_walk(cursor->chain);

	return __dma_fence_unwrap_array(cursor);

}

EXPORT_SYMBOL_GPL(dma_fence_unwrap_next);

include/linux/dma-fence-unwrap.h

+4 −48
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * fence-chain: chain fences together in a timeline

 *

 * Copyright (C) 2022 Advanced Micro Devices, Inc.

 * Authors:

 *	Christian König <christian.koenig@amd.com>
@@ -10,8 +8,7 @@ 
#ifndef __LINUX_DMA_FENCE_UNWRAP_H

#define __LINUX_DMA_FENCE_UNWRAP_H



#include <linux/dma-fence-chain.h>

#include <linux/dma-fence-array.h>

struct dma_fence;



/**

 * struct dma_fence_unwrap - cursor into the container structure
@@ -33,50 +30,9 @@ struct dma_fence_unwrap { 
	unsigned int index;

};



/* Internal helper to start new array iteration, don't use directly */

static inline struct dma_fence *

__dma_fence_unwrap_array(struct dma_fence_unwrap * cursor)

{

	cursor->array = dma_fence_chain_contained(cursor->chain);

	cursor->index = 0;

	return dma_fence_array_first(cursor->array);

}



/**

 * dma_fence_unwrap_first - return the first fence from fence containers

 * @head: the entrypoint into the containers

 * @cursor: current position inside the containers

 *

 * Unwraps potential dma_fence_chain/dma_fence_array containers and return the

 * first fence.

 */

static inline struct dma_fence *

dma_fence_unwrap_first(struct dma_fence *head, struct dma_fence_unwrap *cursor)

{

	cursor->chain = dma_fence_get(head);

	return __dma_fence_unwrap_array(cursor);

}



/**

 * dma_fence_unwrap_next - return the next fence from a fence containers

 * @cursor: current position inside the containers

 *

 * Continue unwrapping the dma_fence_chain/dma_fence_array containers and return

 * the next fence from them.

 */

static inline struct dma_fence *

dma_fence_unwrap_next(struct dma_fence_unwrap *cursor)

{

	struct dma_fence *tmp;



	++cursor->index;

	tmp = dma_fence_array_next(cursor->array, cursor->index);

	if (tmp)

		return tmp;



	cursor->chain = dma_fence_chain_walk(cursor->chain);

	return __dma_fence_unwrap_array(cursor);

}

struct dma_fence *dma_fence_unwrap_first(struct dma_fence *head,

					 struct dma_fence_unwrap *cursor);

struct dma_fence *dma_fence_unwrap_next(struct dma_fence_unwrap *cursor);



/**

 * dma_fence_unwrap_for_each - iterate over all fences in containers