From patchwork Fri Jan 15 14:55:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8041931 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 013AA9F859 for ; Fri, 15 Jan 2016 14:56:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31BA620434 for ; Fri, 15 Jan 2016 14:56:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 173172044B for ; Fri, 15 Jan 2016 14:56:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3922B7A0F5; Fri, 15 Jan 2016 06:56:47 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f169.google.com (mail-yk0-f169.google.com [209.85.160.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2FD547A0F5 for ; Fri, 15 Jan 2016 06:56:46 -0800 (PST) Received: by mail-yk0-f169.google.com with SMTP id v14so451543805ykd.3 for ; Fri, 15 Jan 2016 06:56:46 -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=hET5SfQkfpdnxuTA+WXcuNM1e3clWvsOTSEcFvUL5Eg=; b=dJbvDdUL4OwFDTmwNPNgB0rJ84PdTjaAomPUMEnuPDY2NyATkM1qmd3P56ecrDaekd DNIJpufPnyTHB2FgxdpKdVIMKsUTFyz3osRRQe3xqf1Vr8xxqnUeToRocDrm0r8BztvO MpW4JxuVhtrUD9zJilNttAbGWQga4dELd8mbRXXB4E9O9rJySrh4a6i9PaOy7Gj9YpWf 0+QJnZ5yPRVAOLGddtyO6G9bi0ZtLi4V81Dy+OrqAnvwr/LNdK2G+TRBuSUyMlxv8XBZ pH+eTxECO5FVlaSTIeeHu+g/Yf+8BIC6PjNi2GVOnPMR7VEtc9bnUgooD0YdzMuPy6U4 a7rg== X-Gm-Message-State: ALoCoQlEss9m/9HrYt52Gdk+7sq9SOvEdP3JNBF4V61Gamm1RwtwtjuH9+cZ7HDGuBu/Il1IkLolVaK8iaaS9/KJ8Q3bReftRw== X-Received: by 10.37.33.133 with SMTP id h127mr983501ybh.170.1452869805389; Fri, 15 Jan 2016 06:56:45 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 06:56:44 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [RFC 16/29] dma-buf/fence: create fence_default_timeline_name() Date: Fri, 15 Jan 2016 12:55:26 -0200 Message-Id: <1452869739-3304-17-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 The fence timeline struct already receives the name of the timeline so we can use a default function to return the timeline name. Signed-off-by: Gustavo Padovan --- drivers/dma-buf/fence.c | 14 ++++++++++++++ drivers/staging/android/sync.c | 9 +-------- include/linux/fence.h | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c index 85b5074..f77d6a9 100644 --- a/drivers/dma-buf/fence.c +++ b/drivers/dma-buf/fence.c @@ -456,6 +456,20 @@ const char *fence_default_get_driver_name(struct fence *fence) EXPORT_SYMBOL(fence_default_get_driver_name); /** + * fence_default_get_timeline_name - default get_timeline_name op + * @fence: [in] the fence to retrieve timeline name + * + * This function returns the name of the timeline which the fence belongs to. + */ +const char *fence_default_get_timeline_name(struct fence *fence) +{ + struct fence_timeline *parent = fence_parent(fence); + + return parent->name; +} +EXPORT_SYMBOL(fence_default_get_timeline_name); + +/** * fence_default_enable_signaling - default op for .enable_signaling * @fence: [in] the fence to enable signaling * diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index c3386a6..f8b3c6b 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -321,13 +321,6 @@ int sync_fence_wait(struct sync_fence *sync_fence, long timeout) } EXPORT_SYMBOL(sync_fence_wait); -static const char *sync_fence_get_timeline_name(struct fence *fence) -{ - struct fence_timeline *parent = fence_parent(fence); - - return parent->name; -} - static bool sync_fence_signaled(struct fence *fence) { struct fence_timeline *parent = fence_parent(fence); @@ -377,7 +370,7 @@ static void sync_fence_timeline_value_str(struct fence *fence, static const struct fence_ops sync_fence_ops = { .get_driver_name = fence_default_get_driver_name, - .get_timeline_name = sync_fence_get_timeline_name, + .get_timeline_name = fence_default_get_timeline_name, .enable_signaling = fence_default_enable_signaling, .signaled = sync_fence_signaled, .wait = fence_default_wait, diff --git a/include/linux/fence.h b/include/linux/fence.h index f355c28a..e8f9f12 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); const char *fence_default_get_driver_name(struct fence *fence); +const char *fence_default_get_timeline_name(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);