From patchwork Sat Dec 2 17:40:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schake X-Patchwork-Id: 10088969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 503776035E for ; Sat, 2 Dec 2017 17:41:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2946429A24 for ; Sat, 2 Dec 2017 17:41:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D8C829A5C; Sat, 2 Dec 2017 17:41:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AF17429A24 for ; Sat, 2 Dec 2017 17:41:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E08C6E23D; Sat, 2 Dec 2017 17:41:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 49E526E23D for ; Sat, 2 Dec 2017 17:41:27 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id y82so9325140wmg.1 for ; Sat, 02 Dec 2017 09:41:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9Sds7BXtHqP1TLBHgh1XsTVbvdJ/trudByYQ9823aJg=; b=gSmZYIZ/7WwSL876bAmg2kfH8Tls+JPPOqpJmBRm4F2pfGnKpesEGeAzd1bHN8wkPI WY9PcSwuBO8X+UxHSp7rwW/gQJyDPlsM7KRw8uSKELIhL7U2G/lMBTGtD01V6dHDECNv kzs4HaQpCv6wWIplcWN93HzC9d4NgJlUG6vlvQDV2x2yY4CNo+Hi6jt2jt5HNdKgCjV8 xQpQBW3RpfZa0uq32OObqlZt8zNJ0bAPdtEUOrCJPhG4ADzbWEAk6MpNG6jj/4G9Ty8C H9UTTfYurM9atv/+G7TIriULyldusjdZs+LKlsZT5e2bIkSftGDsHPeNN6GeW7MAhQJr LeuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9Sds7BXtHqP1TLBHgh1XsTVbvdJ/trudByYQ9823aJg=; b=mxpKE1BIcz0+gjpuLTzxKmhvQA7FhxJfvwz1mHuRhyl4ZK+aK7nJOC0Mu3Eb0F+eGp 1Wd8KcZumRy6jiRy5Nsy7WJdv1SNocOcjg75b4ICJd+u8vBQN8z03aRLw4isrG8LK5wS OmbZ9flfuVWOJ/VLgg905hFdRNidoE++JtewWRQqOuYJ+WD1+x7jxme9DehH1zz/IpCm 6GbUj6s1N1uJ1uMUbUmPPX/zYc7acVnr7IDng91p3wIJevIDfQGboFA1hFw9pSTofxqy 8P53XjP3OcbHdi7QkhDKdJKb0gM722GBZjIxpKP0eJ2daNTlALEJbS3upuk13bJDxUxo +r2A== X-Gm-Message-State: AKGB3mKkrX5gLnciQAI2/j5bfjmILfTnvHzNU+AqdxnVV+YVK1L/FeYq 4tElaSrRXxho8JV3+GJttYk= X-Google-Smtp-Source: AGs4zMYZTbzCiaLSXmNKQAI3al2bHYYvdFYJZ2ANl/qYnY5ocUqzfGUWvkZ7socbzZivDKr2urePaA== X-Received: by 10.28.69.197 with SMTP id l66mr3777639wmi.67.1512236485777; Sat, 02 Dec 2017 09:41:25 -0800 (PST) Received: from DESKTOP-FFGKHJ4.localdomain (x4e30777f.dyn.telefonica.de. [78.48.119.127]) by smtp.gmail.com with ESMTPSA id p81sm6965307wrc.61.2017.12.02.09.41.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Dec 2017 09:41:24 -0800 (PST) From: Stefan Schake To: linux-rpi-kernel@lists.infradead.org, Eric Anholt , David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH] drm/vc4: Release fence after signalling Date: Sat, 2 Dec 2017 18:40:39 +0100 Message-Id: <1512236444-301-1-git-send-email-stschake@gmail.com> X-Mailer: git-send-email 1.9.1 Cc: Stefan Schake 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-Virus-Scanned: ClamAV using ClamSMTP We were never releasing the initial fence reference that is obtained through dma_fence_init. Link: https://github.com/anholt/linux/issues/122 Fixes: cdec4d361323 ("drm/vc4: Expose dma-buf fences for V3D rendering.") Signed-off-by: Stefan Schake --- drivers/gpu/drm/vc4/vc4_gem.c | 4 +++- drivers/gpu/drm/vc4/vc4_irq.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index 6c32c89..6385409 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -888,8 +888,10 @@ struct vc4_hang_state { /* If we got force-completed because of GPU reset rather than * through our IRQ handler, signal the fence now. */ - if (exec->fence) + if (exec->fence) { dma_fence_signal(exec->fence); + dma_fence_put(exec->fence); + } if (exec->bo) { for (i = 0; i < exec->bo_count; i++) { diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index 61b2e53..26eddbb 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -139,6 +139,7 @@ list_move_tail(&exec->head, &vc4->job_done_list); if (exec->fence) { dma_fence_signal_locked(exec->fence); + dma_fence_put(exec->fence); exec->fence = NULL; } vc4_submit_next_render_job(dev);