summaryrefslogtreecommitdiff
path: root/benchmarks
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@intel.com>2021-07-10 23:12:09 -0700
committerLucas De Marchi <lucas.demarchi@intel.com>2021-07-15 12:01:57 -0700
commitb3c99f5822f94ac50fdbca12c6bd231ae49e59af (patch)
tree40fa8558465227b0360dd10d2dc9c6cd8191216e /benchmarks
parentde02d108ec73b2dd8ad459d58cee4e1d8e60877d (diff)
benchmarks/gem_busy: nuke LOCAL_IOCTL_SYNCOBJ_WAIT
This is DRM_IOCTL_SYNCOBJ_WAIT. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/gem_busy.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/benchmarks/gem_busy.c b/benchmarks/gem_busy.c
index d417bfe9..514e3387 100644
--- a/benchmarks/gem_busy.c
+++ b/benchmarks/gem_busy.c
@@ -131,22 +131,10 @@ static uint32_t syncobj_create(int fd)
return ret;
}
-#define LOCAL_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)
-#define LOCAL_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)
-struct local_syncobj_wait {
- __u64 handles;
- /* absolute timeout */
- __s64 timeout_nsec;
- __u32 count_handles;
- __u32 flags;
- __u32 first_signaled; /* only valid when not waiting all */
- __u32 pad;
-};
-#define LOCAL_IOCTL_SYNCOBJ_WAIT DRM_IOWR(0xC3, struct local_syncobj_wait)
-static int __syncobj_wait(int fd, struct local_syncobj_wait *args)
+static int __syncobj_wait(int fd, struct drm_syncobj_wait *args)
{
int err = 0;
- if (drmIoctl(fd, LOCAL_IOCTL_SYNCOBJ_WAIT, args))
+ if (drmIoctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, args))
err = -errno;
return err;
}
@@ -285,7 +273,7 @@ static int loop(unsigned ring, int reps, int ncpus, unsigned flags)
for (int inner = 0; inner < 1024; inner++)
poll(&pfd, 1, 0);
} else if (flags & SYNCOBJ) {
- struct local_syncobj_wait arg = {
+ struct drm_syncobj_wait arg = {
.handles = to_user_pointer(&syncobj.handle),
.count_handles = 1,
};