From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751698AbcFWPaT (ORCPT ); Thu, 23 Jun 2016 11:30:19 -0400 Received: from mail-yw0-f195.google.com ([209.85.161.195]:33807 "EHLO mail-yw0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751054AbcFWPaP (ORCPT ); Thu, 23 Jun 2016 11:30:15 -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 2/5] dma-buf/fence-array: add fence_array_teardown() Date: Thu, 23 Jun 2016 12:29:47 -0300 Message-Id: <1466695790-2833-3-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 When using fences in sync files we need to clean up everything when the sync file needs to be freed, thus we need to teardown fence_array, by removing the callback of its fences and putting extra references to the fence_array base fence. Signed-off-by: Gustavo Padovan --- drivers/dma-buf/fence-array.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/dma-buf/fence-array.c b/drivers/dma-buf/fence-array.c index a8731c8..601448a 100644 --- a/drivers/dma-buf/fence-array.c +++ b/drivers/dma-buf/fence-array.c @@ -79,6 +79,21 @@ static bool fence_array_signaled(struct fence *fence) return atomic_read(&array->num_pending) <= 0; } +static void fence_array_teardown(struct fence *fence) +{ + struct fence_array *array = to_fence_array(fence); + struct fence_array_cb *cb = (void *)(&array[1]); + int i; + + for (i = 0; i < array->num_fences; i++) { + if (fence_is_signaled(array->fences[i])) + continue; + + fence_remove_callback(array->fences[i], &cb[i].cb); + fence_put(&array->base); + } +} + static void fence_array_release(struct fence *fence) { struct fence_array *array = to_fence_array(fence); @@ -97,6 +112,7 @@ const struct fence_ops fence_array_ops = { .enable_signaling = fence_array_enable_signaling, .signaled = fence_array_signaled, .wait = fence_default_wait, + .teardown = fence_array_teardown, .release = fence_array_release, }; -- 2.5.5