dma-buf: Rename struct fence to dma_fence (f54d1867) · Commits · e / devices / android_kernel_teracube_mt6765

Documentation/sync_file.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@

		This document serves as a guide for device drivers writers on what the
		sync_file API is, and how drivers can support it. Sync file is the carrier of
		the fences(struct fence) that are needed to synchronize between drivers or
		the fences(struct dma_fence) that are needed to synchronize between drivers or
		across process boundaries.

		The sync_file API is meant to be used to send and receive fence information
		@@ -32,9 +32,9 @@ in-fences and out-fences
		Sync files can go either to or from userspace. When a sync_file is sent from
		the driver to userspace we call the fences it contains 'out-fences'. They are
		related to a buffer that the driver is processing or is going to process, so
		the driver creates an out-fence to be able to notify, through fence_signal(),
		when it has finished using (or processing) that buffer. Out-fences are fences
		that the driver creates.
		the driver creates an out-fence to be able to notify, through
		dma_fence_signal(), when it has finished using (or processing) that buffer.
		Out-fences are fences that the driver creates.

		On the other hand if the driver receives fence(s) through a sync_file from
		userspace we call these fence(s) 'in-fences'. Receiveing in-fences means that
		@@ -47,7 +47,7 @@ Creating Sync Files
		When a driver needs to send an out-fence userspace it creates a sync_file.

		Interface:
		struct sync_file sync_file_create(struct fence fence);
		struct sync_file sync_file_create(struct dma_fence fence);

		The caller pass the out-fence and gets back the sync_file. That is just the
		first step, next it needs to install an fd on sync_file->file. So it gets an
		@@ -72,11 +72,11 @@ of the Sync File to the kernel. The kernel can then retrieve the fences
		from it.

		Interface:
		struct fence *sync_file_get_fence(int fd);
		struct dma_fence *sync_file_get_fence(int fd);


		The returned reference is owned by the caller and must be disposed of
		afterwards using fence_put(). In case of error, a NULL is returned instead.
		afterwards using dma_fence_put(). In case of error, a NULL is returned instead.

		References:
		[1] struct sync_file in include/linux/sync_file.h

drivers/base/Kconfig

+3 −3

Original line number	Diff line number	Diff line
		@@ -248,11 +248,11 @@ config DMA_SHARED_BUFFER
		APIs extension; the file's descriptor can then be passed on to other
		driver.

		config FENCE_TRACE
		bool "Enable verbose FENCE_TRACE messages"
		config DMA_FENCE_TRACE
		bool "Enable verbose DMA_FENCE_TRACE messages"
		depends on DMA_SHARED_BUFFER
		help
		Enable the FENCE_TRACE printks. This will add extra
		Enable the DMA_FENCE_TRACE printks. This will add extra
		spam to the console log, but will make it easier to diagnose
		lockup related problems for dma-buffers shared across multiple
		devices.

drivers/dma-buf/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ config SYNC_FILE
		select DMA_SHARED_BUFFER
		---help---
		The Sync File Framework adds explicit syncronization via
		userspace. It enables send/receive 'struct fence' objects to/from
		userspace. It enables send/receive 'struct dma_fence' objects to/from
		userspace via Sync File fds for synchronization between drivers via
		userspace components. It has been ported from Android.

drivers/dma-buf/Makefile

+1 −1

Original line number	Diff line number	Diff line
		obj-y := dma-buf.o fence.o reservation.o seqno-fence.o fence-array.o
		obj-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o
		obj-$(CONFIG_SYNC_FILE) += sync_file.o
		obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o

drivers/dma-buf/dma-buf.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		#include <linux/fs.h>
		#include <linux/slab.h>
		#include <linux/dma-buf.h>
		#include <linux/fence.h>
		#include <linux/dma-fence.h>
		#include <linux/anon_inodes.h>
		#include <linux/export.h>
		#include <linux/debugfs.h>
		@@ -124,7 +124,7 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence)
		return base + offset;
		}

		static void dma_buf_poll_cb(struct fence fence, struct fence_cb cb)
		static void dma_buf_poll_cb(struct dma_fence fence, struct dma_fence_cb cb)
		{
		struct dma_buf_poll_cb_t dcb = (struct dma_buf_poll_cb_t )cb;
		unsigned long flags;
		@@ -140,7 +140,7 @@ static unsigned int dma_buf_poll(struct file file, poll_table poll)
		struct dma_buf *dmabuf;
		struct reservation_object *resv;
		struct reservation_object_list *fobj;
		struct fence *fence_excl;
		struct dma_fence *fence_excl;
		unsigned long events;
		unsigned shared_count, seq;

		@@ -187,20 +187,20 @@ static unsigned int dma_buf_poll(struct file file, poll_table poll)
		spin_unlock_irq(&dmabuf->poll.lock);

		if (events & pevents) {
		if (!fence_get_rcu(fence_excl)) {
		if (!dma_fence_get_rcu(fence_excl)) {
		/* force a recheck */
		events &= ~pevents;
		dma_buf_poll_cb(NULL, &dcb->cb);
		} else if (!fence_add_callback(fence_excl, &dcb->cb,
		} else if (!dma_fence_add_callback(fence_excl, &dcb->cb,
		dma_buf_poll_cb)) {
		events &= ~pevents;
		fence_put(fence_excl);
		dma_fence_put(fence_excl);
		} else {
		/*
		* No callback queued, wake up any additional
		* waiters.
		*/
		fence_put(fence_excl);
		dma_fence_put(fence_excl);
		dma_buf_poll_cb(NULL, &dcb->cb);
		}
		}
		@@ -222,9 +222,9 @@ static unsigned int dma_buf_poll(struct file file, poll_table poll)
		goto out;

		for (i = 0; i < shared_count; ++i) {
		struct fence *fence = rcu_dereference(fobj->shared[i]);
		struct dma_fence *fence = rcu_dereference(fobj->shared[i]);

		if (!fence_get_rcu(fence)) {
		if (!dma_fence_get_rcu(fence)) {
		/*
		* fence refcount dropped to zero, this means
		* that fobj has been freed
		@@ -235,13 +235,13 @@ static unsigned int dma_buf_poll(struct file file, poll_table poll)
		dma_buf_poll_cb(NULL, &dcb->cb);
		break;
		}
		if (!fence_add_callback(fence, &dcb->cb,
		if (!dma_fence_add_callback(fence, &dcb->cb,
		dma_buf_poll_cb)) {
		fence_put(fence);
		dma_fence_put(fence);
		events &= ~POLLOUT;
		break;
		}
		fence_put(fence);
		dma_fence_put(fence);
		}

		/* No callback queued, wake up any additional waiters. */