From patchwork Fri Jan 15 14:55:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8041871 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 CA11B9FE73 for ; Fri, 15 Jan 2016 14:56:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E47162045A for ; Fri, 15 Jan 2016 14:56:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DE0BE2044C for ; Fri, 15 Jan 2016 14:56:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20EFD7A0E6; Fri, 15 Jan 2016 06:56:36 -0800 (PST) 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 53BCB7A0F2 for ; Fri, 15 Jan 2016 06:56:34 -0800 (PST) Received: by mail-yk0-f194.google.com with SMTP id k129so40237965yke.3 for ; Fri, 15 Jan 2016 06:56:34 -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=w7ISQ67GzeiWEVCwuQad+M+OYYtg46FsA34pno4N3YI=; b=FtyjUhMHu0Gx/PGjaDmXJt6Kfbd9okQQX0xgGOrG7BpxMWbZ/6IlyRtYxSu488VNut pFTIVUOwgxncJf3vhXmx7Y8mFvXduY1Y3BXbB0hr7K+mUU3SxQRuTLWOqpEK2TbxlExT TlzBrmdWLl3y6L4f6EbTKobgdaDqY0RjAbIT4leW+bim8x9DVyJMVwNdpo/fGIsucwkh gT04oQWt6mxChgLMQ4ANRPAC4tC2nc4OSqeteARRxAbMqRhutcvfS1bF/w18CG3iU16J 9YheLwEPwQTcbOKOosSnRKBFxvjsUKvUOOQHhjOEOT9eVerWvr/SZAHAwbZ8kwEpelF4 0aag== X-Gm-Message-State: ALoCoQn8oXOGq/8BCXBF+qzlLYxCheHTM5vjMQQ6FnG5KxdZXcatLjEYjue/ACkigQUNb4QEFDhIbL85M2LabaPn5xaot4aL4w== X-Received: by 10.129.119.10 with SMTP id s10mr8344430ywc.235.1452869793521; Fri, 15 Jan 2016 06:56:33 -0800 (PST) Received: from jade.localdomain ([2804:14c:487:41f:6257:18ff:feab:2e8f]) by smtp.gmail.com with ESMTPSA id o123sm8267717ywd.2.2016.01.15.06.56.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 06:56:32 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [RFC 13/29] dma-buf/fence: create fence_default_enable_signaling() Date: Fri, 15 Jan 2016 12:55:23 -0200 Message-Id: <1452869739-3304-14-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452869739-3304-1-git-send-email-gustavo@padovan.org> References: <1452869739-3304-1-git-send-email-gustavo@padovan.org> Cc: devel@driverdev.osuosl.org, daniels@collabora.com, Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Maarten Lankhorst , 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 Add a default .enable_signaling() op to be used on fence_ops vtable. fence_default_enable_signaling() checks if the was not signaled yet and adds it to the active_list. Signed-off-by: Gustavo Padovan --- drivers/dma-buf/fence.c | 22 ++++++++++++++++++++++ drivers/staging/android/sync.c | 13 +------------ include/linux/fence.h | 1 + 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c index 5dcb94c..51b77ed 100644 --- a/drivers/dma-buf/fence.c +++ b/drivers/dma-buf/fence.c @@ -438,6 +438,28 @@ fence_remove_callback(struct fence *fence, struct fence_cb *cb) } EXPORT_SYMBOL(fence_remove_callback); +/** + * fence_default_enable_signaling - default op for .enable_signaling + * @fence: [in] the fence to enable signaling + * + * This function checks if the fence was already signaled and if not + * adds it to the list of active fences. + */ +bool fence_default_enable_signaling(struct fence *fence) +{ + struct fence_timeline *timeline = fence_parent(fence); + + if (!timeline) + return false; + + if (fence->ops->signaled && fence->ops->signaled(fence)) + return false; + + list_add_tail(&fence->active_list, &timeline->active_list_head); + return true; +} +EXPORT_SYMBOL(fence_default_enable_signaling); + struct default_wait_cb { struct fence_cb base; struct task_struct *task; diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 417cf9f..87fb93c 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -362,17 +362,6 @@ static bool sync_fence_signaled(struct fence *fence) return ret; } -static bool sync_fence_enable_signaling(struct fence *fence) -{ - struct fence_timeline *parent = fence_parent(fence); - - if (sync_fence_signaled(fence)) - return false; - - list_add_tail(&fence->active_list, &parent->active_list_head); - return true; -} - static int sync_fence_fill_driver_data(struct fence *fence, void *data, int size) { @@ -412,7 +401,7 @@ static void sync_fence_timeline_value_str(struct fence *fence, static const struct fence_ops sync_fence_ops = { .get_driver_name = sync_fence_get_driver_name, .get_timeline_name = sync_fence_get_timeline_name, - .enable_signaling = sync_fence_enable_signaling, + .enable_signaling = fence_default_enable_signaling, .signaled = sync_fence_signaled, .wait = fence_default_wait, .release = sync_fence_release, diff --git a/include/linux/fence.h b/include/linux/fence.h index a333bf37..73b8c9f 100644 --- a/include/linux/fence.h +++ b/include/linux/fence.h @@ -295,6 +295,7 @@ static inline void fence_put(struct fence *fence) int fence_signal(struct fence *fence); int fence_signal_locked(struct fence *fence); +bool fence_default_enable_signaling(struct fence *fence); signed long fence_default_wait(struct fence *fence, bool intr, signed long timeout); int fence_add_callback(struct fence *fence, struct fence_cb *cb, fence_func_t func);