From: Gustavo Padovan <gustavo@padovan.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
dri-devel@lists.freedesktop.org,
"Daniel Stone" <daniels@collabora.com>,
"Arve Hjønnevåg" <arve@android.com>,
"Riley Andrews" <riandrews@android.com>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Rob Clark" <robdclark@gmail.com>,
"Greg Hackmann" <ghackmann@google.com>,
"John Harrison" <John.C.Harrison@Intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>
Subject: [PATCH v2 11/13] dma-buf/sync_file: de-stage sync_file
Date: Thu, 28 Apr 2016 10:46:58 -0300 [thread overview]
Message-ID: <1461851220-1583-12-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1461851220-1583-1-git-send-email-gustavo@padovan.org>
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
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>
---
drivers/Kconfig | 2 ++
drivers/dma-buf/Kconfig | 11 +++++++++++
drivers/dma-buf/Makefile | 1 +
drivers/{staging/android => dma-buf}/sync_file.c | 0
drivers/staging/android/Kconfig | 1 +
drivers/staging/android/Makefile | 2 +-
6 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 drivers/dma-buf/Kconfig
rename drivers/{staging/android => dma-buf}/sync_file.c (100%)
diff --git a/drivers/Kconfig b/drivers/Kconfig
index d2ac339..430f761 100644
--- 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
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 57a675f..4a424ec 100644
--- 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 4244821..7a3a77e 100644
--- 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 ebc2df1..980d6dc 100644
--- 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
--
2.5.5
next prev parent reply other threads:[~2016-04-28 13:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 13:46 [PATCH v2 00/13] De-stage Sync File Framework Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 01/13] staging/android: remove redundant comments on sync_merge_data Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put() Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 03/13] staging/android: move sync_file functions comments to sync.c Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 04/13] staging/android: make sync_file_merge() static Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 05/13] staging/android: make sync_file_fdget() static Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 06/13] staging/android: remove name arg from sync_file_create() Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 07/13] staging/android: prepare sync_file for de-staging Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 08/13] staging/android: improve documentation for sync_file Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 09/13] staging/android: style fix: alignment to match the open parenthesis Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 10/13] dma-buf/sync_file: de-stage sync_file headers Gustavo Padovan
2016-04-28 13:46 ` Gustavo Padovan [this message]
2016-04-28 13:46 ` [PATCH v2 12/13] Documentation: include sync_file into DocBook Gustavo Padovan
2016-04-28 13:47 ` [PATCH v2 13/13] Documentation: add Sync File doc Gustavo Padovan
2016-04-30 0:39 ` [PATCH v2 00/13] De-stage Sync File Framework Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461851220-1583-12-git-send-email-gustavo@padovan.org \
--to=gustavo@padovan.org \
--cc=John.C.Harrison@Intel.com \
--cc=arve@android.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniels@collabora.com \
--cc=devel@driverdev.osuosl.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=ghackmann@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavo.padovan@collabora.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=riandrews@android.com \
--cc=robdclark@gmail.com \
--cc=sumit.semwal@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®