From patchwork Fri Feb 26 18:31:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8440691 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E11E39F52D for ; Fri, 26 Feb 2016 18:32:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18256203B6 for ; Fri, 26 Feb 2016 18:32:06 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 29B7E202E6 for ; Fri, 26 Feb 2016 18:32:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E1E956EB2E; Fri, 26 Feb 2016 18:32:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f194.google.com (mail-yk0-f194.google.com [209.85.160.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 31E0D6EB2E for ; Fri, 26 Feb 2016 18:32:02 +0000 (UTC) Received: by mail-yk0-f194.google.com with SMTP id z13so2391156ykd.3 for ; Fri, 26 Feb 2016 10:32:02 -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; bh=+pbaeA5194qV9j6olpjW/ZoEzGjwjyTVXGVtkNe5cUY=; b=MHGRqCfsyCo3qwJK02zdIxtNHt9/MQrQJLNLqMZNjhTGeOrzF19tvvm+CUCWtF40HA 1rjhafmGzeuTIK9o4ERtcgPMYjYqXldUlJaTanMfox02eSpFhltrfR69+SOkbBd3F+ud Cp051SGC4DTIFGJLyGWpUqvaMCq8ncfJQcXvC45hn/os2uFwVQ7/iTYFPieyozvY+pHW obslClEhjgVBgkv004Xud++iomCJlo5wv8RS6Nfl5q9mn+Q7JQ1UoUwg/2M1mbR8kwtS rCAqP9/ufvjQnHamBFQcfZJCpDxKhx9EJm67VhDZCGf6LBIfO+HF2OGKKovZ6CRF2lBW DBig== X-Gm-Message-State: AD7BkJI2yVnznBMxntgs0974sTt0bXL8u8p0CFDqylCywnCwhASK6Gkncocru5bVrMIw9Q== X-Received: by 10.37.24.138 with SMTP id 132mr1719970yby.21.1456511521332; Fri, 26 Feb 2016 10:32:01 -0800 (PST) Received: from jade.localdomain ([177.194.47.65]) by smtp.gmail.com with ESMTPSA id t189sm10720680ywd.43.2016.02.26.10.31.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Feb 2016 10:31:59 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [PATCH v4 1/5] staging/android: add num_fences field to struct sync_file_info Date: Fri, 26 Feb 2016 15:31:43 -0300 Message-Id: <1456511507-2534-1-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 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.2 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 3a8f210..31aa462 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); 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 a0cf357..4ffb7cc 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; __u8 sync_fence_info[0]; };