summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-12-17 12:36:21 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2016-12-17 15:03:41 +0000
commit70f0700e60d66f8b25e33c8f5efe57cb3d4eb534 (patch)
tree6f08124954aaf28c9bc93b248c2b86fcdc61d6ec /lib
parent20fffe7e4209220c63ec45e9b459224833831989 (diff)
lib/sw_sync: Indicate that sync_merge() operates and create a sync_fence
Improvements to self-documentating API that matches the rest of sw_sync. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib')
-rw-r--r--lib/sw_sync.c10
-rw-r--r--lib/sw_sync.h6
2 files changed, 7 insertions, 9 deletions
diff --git a/lib/sw_sync.c b/lib/sw_sync.c
index 8d8e11b1..4977ef17 100644
--- a/lib/sw_sync.c
+++ b/lib/sw_sync.c
@@ -152,15 +152,11 @@ void sw_sync_timeline_inc(int fd, uint32_t count)
do_ioctl(fd, INT_SYNC_IOC_INC, &count);
}
-int sync_merge(int fd1, int fd2)
+int sync_fence_merge(int fd1, int fd2)
{
- struct local_sync_merge_data data = {};
- int err;
+ struct local_sync_merge_data data = { .fd2 = fd2};
- data.fd2 = fd2;
-
- err = ioctl(fd1, LOCAL_SYNC_IOC_MERGE, &data);
- if (err < 0)
+ if (ioctl(fd1, LOCAL_SYNC_IOC_MERGE, &data))
return -errno;
return data.fence;
diff --git a/lib/sw_sync.h b/lib/sw_sync.h
index abcdc523..d7629241 100644
--- a/lib/sw_sync.h
+++ b/lib/sw_sync.h
@@ -31,15 +31,17 @@
#define SW_SYNC_FENCE_STATUS_ACTIVE (0)
#define SW_SYNC_FENCE_STATUS_SIGNALED (1)
+void igt_require_sw_sync(void);
+
int sw_sync_timeline_create(void);
int __sw_sync_fence_create(int fd, uint32_t seqno);
int sw_sync_fence_create(int fd, uint32_t seqno);
void sw_sync_timeline_inc(int fd, uint32_t count);
-int sync_merge(int fd1, int fd2);
+
+int sync_fence_merge(int fd1, int fd2);
int sync_fence_wait(int fence, int timeout);
int sync_fence_count(int fd);
int sync_fence_count_status(int fd, int status);
-void igt_require_sw_sync(void);
#endif