dma-buf/sync_file: de-stage sync_file

sync_file is useful to connect one or more fences to the file. The file is
used by userspace to track fences between drivers that share DMA bufs.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index d2ac339de85fa52a262e372bb483b679601c482b..430f761b0d8d06800138483a442d706dc616e34a 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -114,6 +114,8 @@ source "drivers/rtc/Kconfig"
 
 source "drivers/dma/Kconfig"
 
+source "drivers/dma-buf/Kconfig"
+
 source "drivers/dca/Kconfig"
 
 source "drivers/auxdisplay/Kconfig"

diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig
new file mode 100644 (file)
index 0000000..9824bc4
--- /dev/null
+++ b/drivers/dma-buf/Kconfig
@@ -0,0 +1,11 @@
+menu "DMABUF options"
+
+config SYNC_FILE
+       bool "sync_file support for fences"
+       default n
+       select ANON_INODES
+       select DMA_SHARED_BUFFER
+       ---help---
+         This option enables the fence framework synchronization to export
+         sync_files to userspace that can represent one or more fences.
+endmenu

diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile
index 57a675f90cd05fa94ecb0e0dc7f1ab05ef7b37e8..4a424eca75edd7f31745b835b30e6710e611bd27 100644 (file)
--- a/drivers/dma-buf/Makefile
+++ b/drivers/dma-buf/Makefile
@@ -1 +1,2 @@
 obj-y := dma-buf.o fence.o reservation.o seqno-fence.o
+obj-$(CONFIG_SYNC_FILE)                += sync_file.o

diff --git a/drivers/staging/android/sync_file.c b/drivers/dma-buf/sync_file.c
similarity index 100%
rename from drivers/staging/android/sync_file.c
rename to drivers/dma-buf/sync_file.c

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 68042ab2eba0c88b804ed8f0c1af916c3564a7ff..6480f60ebf6c4a4d2be86ee798d6b304f4b8ceea 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -38,6 +38,7 @@ config SW_SYNC
        bool "Software synchronization objects"
        default n
        depends on SYNC
+       depends on SYNC_FILE
        ---help---
          A sync object driver that uses a 32bit counter to coordinate
          synchronization.  Useful when there is no hardware primitive backing

diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index ebc2df1b14fdee5d29cea3515e2d8b647d2c5b44..980d6dc4b26558614fcb2de03f948eb34641ed49 100644 (file)
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -4,5 +4,5 @@ obj-y                                   += ion/
 
 obj-$(CONFIG_ASHMEM)                   += ashmem.o
 obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)        += lowmemorykiller.o
-obj-$(CONFIG_SYNC)                     += sync_file.o sync.o sync_debug.o
+obj-$(CONFIG_SYNC)                     += sync.o sync_debug.o
 obj-$(CONFIG_SW_SYNC)                  += sw_sync.o