From patchwork Fri Jan 15 14:55:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8041901 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 E5B0DBEEE1 for ; Fri, 15 Jan 2016 14:56:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F91B20439 for ; Fri, 15 Jan 2016 14:56:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D310F2045A for ; Fri, 15 Jan 2016 14:56:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20D8F7A0F1; Fri, 15 Jan 2016 06:56:40 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f182.google.com (mail-yk0-f182.google.com [209.85.160.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E35D7A0F1 for ; Fri, 15 Jan 2016 06:56:38 -0800 (PST) Received: by mail-yk0-f182.google.com with SMTP id a85so467180809ykb.1 for ; Fri, 15 Jan 2016 06:56:38 -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=ZnayLZADMiOC+sxopGz3lHuZ0Qqt59/BX6u9KqKANak=; b=FZqV7E3ZqTt+UVfa+t8a1a3E6tbPUrJgyaY2S1gI2xn8fLnIlopLuPahQHNzI06kJp DFGrys88lHoRhAck9orQPThlnSIdOZocFdVDGnOI/y/nr+6tPjFKg0JLcKH4OixASQ+/ hKPixt1nQVDUPytcb+jlQN3rbyeIHZGYaTq07xYrc1cGmL4fU2BmWTWhZSisbGnPFayK VOq/0JZIMxpJm8WYFqchzdVfeksVJyhoKyTITGfubmOKM35ffWLt40fG/HkB+ojVA+uq WHPVytrRRG4Vc2jErnnYHgHOiAx/CZlH+lTx4sSfFQQgecYbgrmU0uNPllJ4mlT51P7n xMxg== X-Gm-Message-State: ALoCoQl7PTVWk9XiD8rjIbAE9/7SqGIFSSvWG0vZ9PPOrN8LX5ku8wAjD7oYs7ydcYLrf3YE5I8m23gMO41B070mCQUjsv7Gjg== X-Received: by 10.129.108.88 with SMTP id h85mr8481522ywc.156.1452869797569; Fri, 15 Jan 2016 06:56:37 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 06:56:37 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [RFC 14/29] dma-buf/fence: create fence_default_release() Date: Fri, 15 Jan 2016 12:55:24 -0200 Message-Id: <1452869739-3304-15-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 .release() op to be used on fence_ops vtable. It removes the fences from any list it was added, removes a timeline ref and free the fence. Signed-off-by: Gustavo Padovan --- drivers/dma-buf/fence.c | 28 ++++++++++++++++++++++++++++ drivers/staging/android/sync.c | 18 +----------------- include/linux/fence.h | 1 + 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c index 51b77ed..e17397d 100644 --- a/drivers/dma-buf/fence.c +++ b/drivers/dma-buf/fence.c @@ -544,6 +544,34 @@ out: } EXPORT_SYMBOL(fence_default_wait); +/** + * fence_default_release - default .release op + * @fence: [in] the fence to release + * + * This function removes the fence from the child_list * and active_list + * (if it was active) and drops its timeline ref. Finally it frees the + * fence. + */ +void fence_default_release(struct fence *fence) +{ + struct fence_timeline *timeline = fence_parent(fence); + unsigned long flags; + + if (!timeline) + return; + + spin_lock_irqsave(fence->lock, flags); + list_del(&fence->child_list); + if (!list_empty(&fence->active_list)) + list_del(&fence->active_list); + + spin_unlock_irqrestore(fence->lock, flags); + + fence_timeline_put(timeline); + fence_free(fence); +} +EXPORT_SYMBOL(fence_default_release); + static bool fence_test_signaled_any(struct fence **fences, uint32_t count) { diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 87fb93c..6cddec9 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -335,22 +335,6 @@ static const char *sync_fence_get_timeline_name(struct fence *fence) return parent->name; } -static void sync_fence_release(struct fence *fence) -{ - struct fence_timeline *parent = fence_parent(fence); - unsigned long flags; - - spin_lock_irqsave(fence->lock, flags); - list_del(&fence->child_list); - if (!list_empty(&fence->active_list)) - list_del(&fence->active_list); - - spin_unlock_irqrestore(fence->lock, flags); - - fence_timeline_put(parent); - fence_free(fence); -} - static bool sync_fence_signaled(struct fence *fence) { struct fence_timeline *parent = fence_parent(fence); @@ -404,7 +388,7 @@ static const struct fence_ops sync_fence_ops = { .enable_signaling = fence_default_enable_signaling, .signaled = sync_fence_signaled, .wait = fence_default_wait, - .release = sync_fence_release, + .release = fence_default_release, .fill_driver_data = sync_fence_fill_driver_data, .fence_value_str = sync_fence_value_str, .timeline_value_str = sync_fence_timeline_value_str, diff --git a/include/linux/fence.h b/include/linux/fence.h index 73b8c9f..0c97014 100644 --- a/include/linux/fence.h +++ b/include/linux/fence.h @@ -297,6 +297,7 @@ 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); +void fence_default_release(struct fence *fence); int fence_add_callback(struct fence *fence, struct fence_cb *cb, fence_func_t func); bool fence_remove_callback(struct fence *fence, struct fence_cb *cb);