From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751599AbcFWPaN (ORCPT ); Thu, 23 Jun 2016 11:30:13 -0400 Received: from mail-yw0-f196.google.com ([209.85.161.196]:34775 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbcFWPaK (ORCPT ); Thu, 23 Jun 2016 11:30:10 -0400 From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Daniel Stone , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Sumit Semwal , Maarten Lankhorst , Gustavo Padovan Subject: [RFC 1/5] dma-buf/fence: add .teardown() ops Date: Thu, 23 Jun 2016 12:29:46 -0300 Message-Id: <1466695790-2833-2-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466695790-2833-1-git-send-email-gustavo@padovan.org> References: <1466695790-2833-1-git-send-email-gustavo@padovan.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gustavo Padovan fence_array requires a function to clean up its state before we are able to call fence_put() and release it. Signed-off-by: Gustavo Padovan --- drivers/dma-buf/fence.c | 7 +++++++ include/linux/fence.h | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c index 4d51f9e..4e61afb 100644 --- a/drivers/dma-buf/fence.c +++ b/drivers/dma-buf/fence.c @@ -185,6 +185,13 @@ void fence_release(struct kref *kref) } EXPORT_SYMBOL(fence_release); +void fence_teardown(struct fence *fence) +{ + if (fence->ops->teardown) + fence->ops->teardown(fence); +} +EXPORT_SYMBOL(fence_teardown); + void fence_free(struct fence *fence) { kfree_rcu(fence, rcu); diff --git a/include/linux/fence.h b/include/linux/fence.h index 44d945e..1d3b671 100644 --- a/include/linux/fence.h +++ b/include/linux/fence.h @@ -114,6 +114,7 @@ struct fence_cb { * @enable_signaling: enable software signaling of fence. * @signaled: [optional] peek whether the fence is signaled, can be null. * @wait: custom wait implementation, or fence_default_wait. + * @teardown: [optional] teardown fence data but not put it * @release: [optional] called on destruction of fence, can be null * @fill_driver_data: [optional] callback to fill in free-form debug info * Returns amount of bytes filled, or -errno. @@ -161,6 +162,10 @@ struct fence_cb { * which should be treated as if the fence is signaled. For example a hardware * lockup could be reported like that. * + * Notes on teardown: + * Can be NULL, this function clean ups the fence data before the fence_put + * call. + * * Notes on release: * Can be NULL, this function allows additional commands to run on * destruction of the fence. Can be called from irq context. @@ -173,6 +178,7 @@ struct fence_ops { bool (*enable_signaling)(struct fence *fence); bool (*signaled)(struct fence *fence); signed long (*wait)(struct fence *fence, bool intr, signed long timeout); + void (*teardown)(struct fence *fence); void (*release)(struct fence *fence); int (*fill_driver_data)(struct fence *fence, void *data, int size); @@ -184,6 +190,7 @@ void fence_init(struct fence *fence, const struct fence_ops *ops, spinlock_t *lock, u64 context, unsigned seqno); void fence_release(struct kref *kref); +void fence_teardown(struct fence *fence); void fence_free(struct fence *fence); /** -- 2.5.5