From patchwork Wed Sep 14 15:04:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9331833 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 081976089F for ; Wed, 14 Sep 2016 15:05:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBBA529F23 for ; Wed, 14 Sep 2016 15:05:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E08A72A11C; Wed, 14 Sep 2016 15:05:21 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY 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 0FBA52A104 for ; Wed, 14 Sep 2016 15:05:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C120B6E775; Wed, 14 Sep 2016 15:05:03 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 125936E771 for ; Wed, 14 Sep 2016 15:04:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id A1A142602AC From: robert.foss@collabora.com To: intel-gfx@lists.freedesktop.org, Gustavo Padovan , Daniel Stone , Daniel Vetter , Marius Vlad , Eric Engestrom , Chris Wilson Date: Wed, 14 Sep 2016 11:04:30 -0400 Message-Id: <20160914150442.18183-2-robert.foss@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160914150442.18183-1-robert.foss@collabora.com> References: <20160914150442.18183-1-robert.foss@collabora.com> MIME-Version: 1.0 Cc: Gustavo Padovan Subject: [Intel-gfx] [PATCH i-g-t v4 01/13] lib/sw_sync: Add helper functions for managing synchronization primitives 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 From: Robert Foss Base functions to help testing the Sync File Framework (explicit fencing mechanism ported from Android). These functions allow you to create, use and destroy timelines and fences. Signed-off-by: Robert Foss Signed-off-by: Gustavo Padovan Reviewed-by: Eric Engestrom --- lib/Makefile.sources | 2 + lib/sw_sync.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/sw_sync.h | 48 +++++++++++++ 3 files changed, 240 insertions(+) create mode 100644 lib/sw_sync.c create mode 100644 lib/sw_sync.h diff --git a/lib/Makefile.sources b/lib/Makefile.sources index bac9a7f..3dc7c3c 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -61,6 +61,8 @@ lib_source_list = \ rendercopy_gen8.c \ rendercopy_gen9.c \ rendercopy.h \ + sw_sync.c \ + sw_sync.h \ intel_reg_map.c \ intel_iosf.c \ igt_kms.c \ diff --git a/lib/sw_sync.c b/lib/sw_sync.c new file mode 100644 index 0000000..4e64837 --- /dev/null +++ b/lib/sw_sync.c @@ -0,0 +1,190 @@ +/* + * Copyright 2012 Google, Inc + * Copyright © 2016 Collabora, Ltd. + * + * Based on the implementation from the Android Open Source Project + * + * 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. + * + * Authors: + * Robert Foss + */ + +#ifndef ANDROID +#define _GNU_SOURCE +#else +#include +#endif +#include +#include +#include +#include +#include + +#include "sw_sync.h" +#include "drmtest.h" +#include "ioctl_wrappers.h" + +#ifndef SW_SYNC_IOC_INC +struct sw_sync_create_fence_data { + __u32 value; + char name[32]; + __s32 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) +#endif + +#define DEVFS_SW_SYNC "/dev/sw_sync" +#define DEBUGFS_SW_SYNC "/sys/kernel/debug/sync/sw_sync" + + +int sw_sync_fd_is_valid(int fd) +{ + int status; + + if (fd < 0) + return 0; + + status = fcntl(fd, F_GETFD, 0); + return status >= 0; +} + +int sw_sync_timeline_create(void) +{ + int fd = open(DEVFS_SW_SYNC, O_RDWR); + + if (fd < 0) + fd = open(DEBUGFS_SW_SYNC, O_RDWR); + + igt_assert(sw_sync_fd_is_valid(fd)); + + return fd; +} + +int __sw_sync_fence_create(int fd, uint32_t seqno) +{ + + struct sw_sync_create_fence_data data; + + memset(&data, 0, sizeof(data)); + data.value = seqno; + + if (igt_ioctl(fd, SW_SYNC_IOC_CREATE_FENCE, &data)) + return -errno; + + return data.fence; +} + +int sw_sync_fence_create(int fd, uint32_t seqno) +{ + int fence = __sw_sync_fence_create(fd, seqno); + igt_assert(fence >= 0); + return fence; +} + +void sw_sync_timeline_inc(int fd, uint32_t count) +{ + uint32_t arg = count; + + if (fd == 0) + return; + + do_ioctl(fd, SW_SYNC_IOC_INC, &arg); +} + +int sw_sync_merge(int fd1, int fd2) +{ + struct sync_merge_data data = {}; + int err; + + data.fd2 = fd2; + + err = ioctl(fd1, SYNC_IOC_MERGE, &data); + if (err < 0) + return -errno; + + sw_sync_fd_is_valid(data.fence); + + return data.fence; +} + +int sw_sync_wait(int fence, int timeout) +{ + struct pollfd fds; + int ret; + + fds.fd = fence; + fds.events = POLLIN | POLLERR; + + ret = poll(&fds, 1, timeout); + + return ret; +} + +int sw_sync_fence_count(int fd) +{ + struct sync_file_info info; + + memset(&info, 0, sizeof(info)); + if (ioctl(fd, SYNC_IOC_FILE_INFO, &info)) + return -errno; + + return info.num_fences; +} + +static int __sw_sync_fence_count_status(int fd, int status) +{ + struct sync_file_info info; + struct sync_fence_info *fence_info; + int count; + int i; + + memset(&info, 0, sizeof(info)); + if (ioctl(fd, SYNC_IOC_FILE_INFO, &info)) + return -errno; + + fence_info = calloc(info.num_fences, sizeof(*fence_info)); + if (!fence_info) + return -ENOMEM; + + info.sync_fence_info = (uintptr_t)fence_info; + if (ioctl(fd, SYNC_IOC_FILE_INFO, &info)) { + count = -errno; + } else { + count = 0; + for (i = 0 ; i < info.num_fences ; i++) + count += fence_info[i].status == status; + } + + free(fence_info); + + return count; +} + +int sw_sync_fence_count_status(int fd, int status) +{ + int count = __sw_sync_fence_count_status(fd, status); + igt_assert(count >= 0); + return count; +} diff --git a/lib/sw_sync.h b/lib/sw_sync.h new file mode 100644 index 0000000..fee9249 --- /dev/null +++ b/lib/sw_sync.h @@ -0,0 +1,48 @@ +/* + * Copyright 2012 Google, Inc + * Copyright © 2016 Collabora, Ltd. + * + * Based on the implementation from the Android Open Source Project + * + * 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. + * + * Authors: + * Robert Foss + */ + +#ifndef SW_SYNC_H +#define SW_SYNC_H + +#define SW_SYNC_FENCE_STATUS_ERROR (-1) +#define SW_SYNC_FENCE_STATUS_ACTIVE (0) +#define SW_SYNC_FENCE_STATUS_SIGNALED (1) + +int sw_sync_fd_is_valid(int fd); +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 sw_sync_merge(int fd1, int fd2); +int sw_sync_wait(int fence, int timeout); +int sw_sync_fence_count(int fd); +int sw_sync_fence_count_status(int fd, int status); + +#endif +