From patchwork Thu Aug 10 01:32:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 9892477 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 6684060325 for ; Thu, 10 Aug 2017 01:32:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66CA928A02 for ; Thu, 10 Aug 2017 01:32:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A53E28A05; Thu, 10 Aug 2017 01:32:34 +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 A5E9228A02 for ; Thu, 10 Aug 2017 01:32:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F0BF86E3BC; Thu, 10 Aug 2017 01:32:31 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5FB276E3BC for ; Thu, 10 Aug 2017 01:32:30 +0000 (UTC) Received: by mail-pg0-x241.google.com with SMTP id 83so7189252pgb.4 for ; Wed, 09 Aug 2017 18:32:30 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=h/ezMKEoPGAfthuWJJuXaTRNxPyArMSKZD11pe5VAuc=; b=a08F5L/vjWiN9eIGxnLU0NC+Ukrwsrxsv7HCWMMrXe9+SfpZ4RdkYkvZWu63fK7t+t +o6Osfvdr7zopBLU0EUalnglrQyoEYWW7ijBsD2fscWH2+owG9wclZEU+ttLYoiVGQQC saMMK0cihvIuRHGY1yw+agVzB5JygSJ4tOQbzkOqgDcNbZIC7xYdIyt/6jVjS0If+K9O Io1Nv7Eiz6xEA8UfVQlgeR/lgOoFjYBdaMTL2YXfVut4lpoWhf+pTqnNlN6gJDLgBZ+y PUElnMyj0Wa6f16l7hp5DWeUNlr9GthrMmuqi7d/mUdLwj8mJ6kOpwgmflwPYqgQomgy iahg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=h/ezMKEoPGAfthuWJJuXaTRNxPyArMSKZD11pe5VAuc=; b=QcG9olH4Tr59ZuEFOHe6TPp4soswPrZUAvbIbPKhpwi8U+BcVidLXTPW7DJqdae6nq eVlCt+IsC51fFYzLn7pTbLo4nt8wvGYCRGkHRfpwRGAEBSzc78oYXcyzn9kWA8OcYcPa MCW1gTZUTE1E0sgByUeQNnLZ3yTZsh114t3CehZ6igMNGR/2cyIhkUEgbbFea7xiaU7H HMh2BPIy37l1v8GFOJZQU/fSWU0hQAW9bGZ6Q6pH+mgltogZiCqBb00rqe5zQIC23fUs AA9BT6shMfGaTKbGAmHvw065z4GQ60Zc9IPYgYhBKEhgOypKAo04W0dCIYhAeCzhyfK5 NI3A== X-Gm-Message-State: AHYfb5gGHO7t7j07uRsF1BWuVhQxafAl7bGWOBvyQsSsnDgeLofDpz6/ pMq+p8mwb+ydSbHhMhSQEA== X-Received: by 10.99.185.75 with SMTP id v11mr10045132pgo.189.1502328749563; Wed, 09 Aug 2017 18:32:29 -0700 (PDT) Received: from omlet.ak.intel.com ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id t80sm4710656pfk.151.2017.08.09.18.32.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Aug 2017 18:32:28 -0700 (PDT) From: Jason Ekstrand X-Google-Original-From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Aug 2017 18:32:22 -0700 Message-Id: <1502328745-10663-1-git-send-email-jason.ekstrand@intel.com> X-Mailer: git-send-email 2.5.0.400.gff86faf In-Reply-To: <1502304574-12189-1-git-send-email-jason.ekstrand@intel.com> References: <1502304574-12189-1-git-send-email-jason.ekstrand@intel.com> MIME-Version: 1.0 Cc: Jason Ekstrand Subject: [Intel-gfx] [PATCH 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 | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/igt_syncobj.h | 65 +++++++++++++++++++ 3 files changed, 243 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..ce9c1e2 --- /dev/null +++ b/lib/igt_syncobj.c @@ -0,0 +1,176 @@ +/* + * 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; +} + +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..d37e638 --- /dev/null +++ b/lib/igt_syncobj.h @@ -0,0 +1,65 @@ +/* + * 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); +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 */