From patchwork Thu Aug 10 23:34:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 9894717 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D8F2A60348 for ; Thu, 10 Aug 2017 23:35:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CABC628BA3 for ; Thu, 10 Aug 2017 23:35:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF56628BB7; Thu, 10 Aug 2017 23:35:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EABBF28BA3 for ; Thu, 10 Aug 2017 23:35:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C56D36E632; Thu, 10 Aug 2017 23:35:08 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0766F6E632 for ; Thu, 10 Aug 2017 23:35:07 +0000 (UTC) Received: by mail-pf0-x243.google.com with SMTP id j68so1929470pfc.2 for ; Thu, 10 Aug 2017 16:35:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WxOj+7BkXNtvYsTqhjYa4KXhMkUqItSkxO1x/QOCNes=; b=nCSZiclGq/kmHrk8dOPHdHpNvFr0doK03axOyyjbWrfw57tEHvt9EHU7vBDAa7rd8T upc+GjV56YM7mkMjP5TapFM0UyCNu+ghTk1JF9SwrZOkacBC0Qoudy4f+8w9LbvECbqw GpOfkv08AGl96Wu8VeOQ1PLCm2tQe1qShd4T2WOm0o0AKFRclJ6NMgHcwn+PQqX7fTTR UCcJxtvS/VW/IruLhJwHpfqxuV9qx3uZjkOqgerdRFeiIhlY54FVuBBEVCUfwBfR01e9 3+PXeCS74T00Il1Jp2HiBfxGEt9S9CSrVXTDYtJ/OQWrtIAxsictJa1FHc46j0eubrEN 72QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WxOj+7BkXNtvYsTqhjYa4KXhMkUqItSkxO1x/QOCNes=; b=IRe1gIldX+qxN0A28BsxVBx+ByI+Z4CncX4uiWDo3BEIaivru2fEM5dB3b31zTZByu T1hwX6FUvfOTt2nBLJr4gfh73NyqNbZ8KV5nCkVSY7mzT9zgJwmVILvk6nuahy2GnFl+ FwU65s1uwaUVYYD46fKs1HX17YU1xyrP2qXnVzzevPPW9NdVMd7Cpr1bPDL7Sq54KlwD vAzphSilDXIHVGoAG1z2Ep5BdNkckbcmXKEYEXQk3E5LpGqDoTBUQyP8hzSDz+8/Rf2J iRyi/wp+TS9UhA9A9RCUnpiEAbrGgXtMYZph6y8lWf26k5n5OfyZ7IAwNLBS7l2yhfPN P6ow== X-Gm-Message-State: AHYfb5jIqcRCDXIxibV4e2jTIDW6O8gSbElfXRYbL6jdG1S5lihE4D3D pbsHXGwJ08m8kwIChD+DSQ== X-Received: by 10.98.78.73 with SMTP id c70mr14066421pfb.17.1502408107108; Thu, 10 Aug 2017 16:35:07 -0700 (PDT) Received: from omlet.ak.intel.com (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id i90sm14409074pfi.106.2017.08.10.16.35.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Aug 2017 16:35:06 -0700 (PDT) From: Jason Ekstrand X-Google-Original-From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org Date: Thu, 10 Aug 2017 16:34:57 -0700 Message-Id: <1502408100-7660-1-git-send-email-jason.ekstrand@intel.com> X-Mailer: git-send-email 2.5.0.400.gff86faf MIME-Version: 1.0 Cc: Jason Ekstrand Subject: [Intel-gfx] [PATCH i-g-t 1/4] lib: Add some syncobj helpers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jason Ekstrand --- lib/Makefile.sources | 2 + lib/igt_syncobj.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/igt_syncobj.h | 66 ++++++++++++++++++ 3 files changed, 254 insertions(+) create mode 100644 lib/igt_syncobj.c create mode 100644 lib/igt_syncobj.h diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 53fdb54..692fe30 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -83,6 +83,8 @@ lib_source_list = \ uwildmat/uwildmat.c \ igt_kmod.c \ igt_kmod.h \ + igt_syncobj.c \ + igt_syncobj.h \ $(NULL) .PHONY: version.h.tmp diff --git a/lib/igt_syncobj.c b/lib/igt_syncobj.c new file mode 100644 index 0000000..fe0d26c --- /dev/null +++ b/lib/igt_syncobj.c @@ -0,0 +1,186 @@ +/* + * Copyright © 2017 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include + +#include "igt.h" +#include "igt_syncobj.h" + +static int +__syncobj_create(int fd, uint32_t *handle) +{ + struct drm_syncobj_create create = { 0 }; + int err = 0; + + if (drmIoctl(fd, DRM_IOCTL_SYNCOBJ_CREATE, &create)) + err = -errno; + *handle = create.handle; + return err; +} + +uint32_t +syncobj_create(int fd) +{ + uint32_t handle; + igt_assert_eq(__syncobj_create(fd, &handle), 0); + igt_assert(handle); + return handle; +} + +static int +__syncobj_destroy(int fd, uint32_t handle) +{ + struct drm_syncobj_destroy destroy = { 0 }; + int err = 0; + + destroy.handle = handle; + if (drmIoctl(fd, DRM_IOCTL_SYNCOBJ_DESTROY, &destroy)) + err = -errno; + return err; +} + +void +syncobj_destroy(int fd, uint32_t handle) +{ + igt_assert_eq(__syncobj_destroy(fd, handle), 0); +} + +int +__syncobj_handle_to_fd(int fd, struct drm_syncobj_handle *args) +{ + int err = 0; + if (drmIoctl(fd, DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, args)) + err = -errno; + return err; +} + +int +syncobj_handle_to_fd(int fd, uint32_t handle, uint32_t flags) +{ + struct drm_syncobj_handle args = { 0 }; + args.handle = handle; + args.flags = flags; + igt_assert_eq(__syncobj_handle_to_fd(fd, &args), 0); + igt_assert(args.fd >= 0); + return args.fd; +} + +int +__syncobj_fd_to_handle(int fd, struct drm_syncobj_handle *args) +{ + int err = 0; + if (drmIoctl(fd, DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE, args)) + err = -errno; + return err; +} + +uint32_t +syncobj_fd_to_handle(int fd, int syncobj_fd, uint32_t flags) +{ + struct drm_syncobj_handle args = { 0 }; + args.fd = syncobj_fd; + args.flags = flags; + igt_assert_eq(__syncobj_fd_to_handle(fd, &args), 0); + igt_assert(args.handle > 0); + return args.handle; +} + +void +syncobj_import_sync_file(int fd, uint32_t handle, int sync_file) +{ + struct drm_syncobj_handle args = { 0 }; + args.handle = handle; + args.fd = sync_file; + args.flags = DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE; + igt_assert_eq(__syncobj_fd_to_handle(fd, &args), 0); +} + +int +__syncobj_wait(int fd, struct local_syncobj_wait *args) +{ + int err = 0; + if (drmIoctl(fd, LOCAL_IOCTL_SYNCOBJ_WAIT, args)) + err = -errno; + return err; +} + +int +syncobj_wait_err(int fd, uint32_t *handles, uint32_t count, + uint64_t abs_timeout_nsec, uint32_t flags) +{ + struct local_syncobj_wait wait; + + wait.handles = to_user_pointer(handles); + wait.timeout_nsec = abs_timeout_nsec; + wait.count_handles = count; + wait.flags = flags; + wait.first_signaled = 0; + wait.pad = 0; + + return __syncobj_wait(fd, &wait); +} + +bool +syncobj_wait(int fd, uint32_t *handles, uint32_t count, + uint64_t abs_timeout_nsec, uint32_t flags, + uint32_t *first_signaled) +{ + struct local_syncobj_wait wait; + int ret; + + wait.handles = to_user_pointer(handles); + wait.timeout_nsec = abs_timeout_nsec; + wait.count_handles = count; + wait.flags = flags; + wait.first_signaled = 0; + wait.pad = 0; + + ret = __syncobj_wait(fd, &wait); + if (ret == ETIME) + return false; + + igt_assert_eq(ret, 0); + if (first_signaled) + *first_signaled = wait.first_signaled; + + return true; +} + +static int +__syncobj_reset(int fd, uint32_t handle) +{ + struct local_syncobj_reset reset = { 0 }; + int err = 0; + + reset.handle = handle; + if (drmIoctl(fd, LOCAL_IOCTL_SYNCOBJ_RESET, &reset)) + err = -errno; + return err; +} + +void +syncobj_reset(int fd, uint32_t handle) +{ + igt_assert_eq(__syncobj_reset(fd, handle), 0); +} diff --git a/lib/igt_syncobj.h b/lib/igt_syncobj.h new file mode 100644 index 0000000..5840c1c --- /dev/null +++ b/lib/igt_syncobj.h @@ -0,0 +1,66 @@ +/* + * Copyright © 2017 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef IGT_SYNCOBJ_H +#define IGT_SYNCOBJ_H + +#include +#include +#include + +#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; +}; + +struct local_syncobj_reset { + __u32 handle; + __u32 flags; +}; + +#define LOCAL_IOCTL_SYNCOBJ_WAIT DRM_IOWR(0xC3, struct local_syncobj_wait) +#define LOCAL_IOCTL_SYNCOBJ_RESET DRM_IOWR(0xC4, struct local_syncobj_reset) + +uint32_t syncobj_create(int fd); +void syncobj_destroy(int fd, uint32_t handle); +int __syncobj_handle_to_fd(int fd, struct drm_syncobj_handle *args); +int __syncobj_fd_to_handle(int fd, struct drm_syncobj_handle *args); +int syncobj_handle_to_fd(int fd, uint32_t handle, uint32_t flags); +uint32_t syncobj_fd_to_handle(int fd, int syncobj_fd, uint32_t flags); +void syncobj_import_sync_file(int fd, uint32_t handle, int sync_file); +int __syncobj_wait(int fd, struct local_syncobj_wait *args); +int syncobj_wait_err(int fd, uint32_t *handles, uint32_t count, + uint64_t abs_timeout_nsec, uint32_t flags); +bool syncobj_wait(int fd, uint32_t *handles, uint32_t count, + uint64_t abs_timeout_nsec, uint32_t flags, + uint32_t *first_signaled); +void syncobj_reset(int fd, uint32_t handle); + +#endif /* IGT_SYNCOBJ_H */