From patchwork Mon Dec 9 00:10:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 3307951 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7585C9F384 for ; Mon, 9 Dec 2013 01:17:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 793A62021F for ; Mon, 9 Dec 2013 01:17:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A61232021B for ; Mon, 9 Dec 2013 01:17:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8735FAD42; Sun, 8 Dec 2013 17:17:00 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 474 seconds by postgrey-1.32 at gabe; Sun, 08 Dec 2013 16:16:19 PST Received: from caramon.arm.linux.org.uk (caramon.arm.linux.org.uk [78.32.30.218]) by gabe.freedesktop.org (Postfix) with ESMTP id A32A5FAC46 for ; Sun, 8 Dec 2013 16:16:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Subject:To:From:References:In-Reply-To; bh=4t2x5QdyNLfanXkSb8st4qEBBkr52ndjQESeyGPoTWo=; b=PcjDEI6A0AK8dJcBdbPQIx3gQ6CpAzv8PSBvF72O7QtL6Lmf9T6yZim1PGyQWGxBw8mBtQ0mwEwHTgR+GeukXNPRRJ+I+F9PRlFNQKaUXziE5EtCJz/IWSCRw2kUqYz/Mym+/isdfUh7GS+uSlRmTVGqq24hyZzDcW83S2l/eDM=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd]:34000 helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1VpoQa-0005ms-Um; Mon, 09 Dec 2013 00:10:25 +0000 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1VpoQa-0000qs-6g; Mon, 09 Dec 2013 00:10:24 +0000 In-Reply-To: <20131209000421.GV4360@n2100.arm.linux.org.uk> References: <20131209000421.GV4360@n2100.arm.linux.org.uk> From: Russell King To: Rob Clark , David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH RFC 4/4] DRM: Armada: prime refcounting bug fix Message-Id: Date: Mon, 09 Dec 2013 00:10:24 +0000 X-Mailman-Approved-At: Sun, 08 Dec 2013 17:16:56 -0800 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Commit 011c2282c74d changed the way refcounting on imported dma_bufs works, and this hadn't been spotted while forward-porting Armada. Reflect the changes in that commit into the Armada driver. Signed-off-by: Russell King Reviewed-by: Thierry Reding --- drivers/gpu/drm/armada/armada_gem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index adc7c2da75bb..887816f43476 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -558,7 +558,6 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf) * refcount on the gem object itself. */ drm_gem_object_reference(obj); - dma_buf_put(buf); return obj; } } @@ -574,6 +573,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf) } dobj->obj.import_attach = attach; + get_dma_buf(buf); /* * Don't call dma_buf_map_attachment() here - it maps the