From patchwork Wed Feb 3 13:25:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8202851 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EF88ABEEE5 for ; Wed, 3 Feb 2016 13:26:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2509B202D1 for ; Wed, 3 Feb 2016 13:26:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 10736202BE for ; Wed, 3 Feb 2016 13:26:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 359886E6FF; Wed, 3 Feb 2016 05:26:26 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vk0-f67.google.com (mail-vk0-f67.google.com [209.85.213.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id D6B5E6E700 for ; Wed, 3 Feb 2016 05:26:24 -0800 (PST) Received: by mail-vk0-f67.google.com with SMTP id e64so631493vkg.3 for ; Wed, 03 Feb 2016 05:26:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NVcKiEX6RsIAk6xrJowQhl1IvXa3YwogvmRNOCD/SPk=; b=bJodEMmVVQRj/IToNkUfNyBaaPj3qkzla3pUj52JS4VmhoGJLiOrpP5IXCNTiorhAi ywX8v6p6J5yB/PrZLmnv/2XjZa6o5VNDfdPFgRHl9R7j33r7Hhwcs8BKyYgqb9glkgN4 wy9IsW3ZPyCKpIl9EmhV9aJnhXfDgLod4pCbIJ8CVuzKV/6cp+EA4TO//E6RuSi3rnsk e/kIznVLWp54Fq9a8jZeUVguTDCLMNHChWEhz6bgGfj3Pgz+OFZDrUx2n73WEAVPrL5N tP9OpiJdJJZBZLQoZgNrC4fYQvIzz5QayJirgNQiS8orsAadzMIZUYOglonIO8mk06XF ic+w== X-Gm-Message-State: AG10YOTt7tBOdcxx7kp7IlhsUZqdpLDq9BAKZNRUGMI1NAeKUULPeAaHC6evaJJsxG3V0w== X-Received: by 10.31.135.79 with SMTP id j76mr1043809vkd.91.1454505984171; Wed, 03 Feb 2016 05:26:24 -0800 (PST) Received: from jade.home ([177.138.212.72]) by smtp.gmail.com with ESMTPSA id i126sm2982001vke.23.2016.02.03.05.26.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2016 05:26:23 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [PATCH v3 07/11] staging/android: add num_fences field to struct sync_file_info Date: Wed, 3 Feb 2016 11:25:36 -0200 Message-Id: <1454505940-18094-8-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454505940-18094-1-git-send-email-gustavo@padovan.org> References: <1454505940-18094-1-git-send-email-gustavo@padovan.org> Cc: devel@driverdev.osuosl.org, Daniel Stone , Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Gustavo Padovan , John Harrison X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan Inform userspace how many fences are in the sync_fence_info field. Signed-off-by: Gustavo Padovan --- drivers/staging/android/sync.c | 2 ++ drivers/staging/android/uapi/sync.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 8425457..e301b55 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -525,6 +525,8 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, if (info->status >= 0) info->status = !info->status; + info->num_fences = sync_file->num_fences; + len = sizeof(struct sync_file_info) - sizeof(__u64); for (i = 0; i < sync_file->num_fences; ++i) { diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h index e649953..fc7fbcf 100644 --- a/drivers/staging/android/uapi/sync.h +++ b/drivers/staging/android/uapi/sync.h @@ -47,12 +47,14 @@ struct sync_fence_info { * userspace including pt_info. * @name: name of fence * @status: status of fence. 1: signaled 0:active <0:error + * @num_fences number of fences in the sync_file * @sync_fence_info: array of sync_fence_info for every fence in the sync_file */ struct sync_file_info { __u32 len; char name[32]; __s32 status; + __u32 num_fences; __u64 sync_fence_info; };