summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android/sw_sync.c
diff options
context:
space:
mode:
authorGustavo Padovan2016-05-31 21:59:08 +0200
committerGreg Kroah-Hartman2016-06-18 06:17:40 +0200
commit6f65aa8925f7a908eb4d08339c03c40a300ac461 (patch)
tree601e0e3a1e8d8d95898631362fb238073a936c22 /drivers/staging/android/sw_sync.c
parentstaging/android: make sync_timeline internal to sw_sync (diff)
downloadkernel-qcow2-linux-6f65aa8925f7a908eb4d08339c03c40a300ac461.tar.gz
kernel-qcow2-linux-6f65aa8925f7a908eb4d08339c03c40a300ac461.tar.xz
kernel-qcow2-linux-6f65aa8925f7a908eb4d08339c03c40a300ac461.zip
staging/android: make sw_ioctl info internal to sw_sync.c
We don't want to export this from the kernel. This is interface is only for testing and debug. So testers shall copy the ioctl info in their own projects. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/sw_sync.c')
-rw-r--r--drivers/staging/android/sw_sync.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index c149ac90f040..72262ba4df7f 100644
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -20,12 +20,23 @@
#include <linux/slab.h>
#include <linux/sync_file.h>
-#include "uapi/sw_sync.h"
#include "sync.h"
#define CREATE_TRACE_POINTS
#include "trace/sync.h"
+struct sw_sync_create_fence_data {
+ __u32 value;
+ char name[32];
+ __s32 fence; /* fd of new fence */
+};
+
+#define SW_SYNC_IOC_MAGIC 'W'
+
+#define SW_SYNC_IOC_CREATE_FENCE _IOWR(SW_SYNC_IOC_MAGIC, 0,\
+ struct sw_sync_create_fence_data)
+#define SW_SYNC_IOC_INC _IOW(SW_SYNC_IOC_MAGIC, 1, __u32)
+
static const struct fence_ops timeline_fence_ops;
static inline struct sync_pt *fence_to_sync_pt(struct fence *fence)