From patchwork Mon Dec 9 00:08:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 3307971 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 5E5D89F384 for ; Mon, 9 Dec 2013 01:17:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0F932021C for ; Mon, 9 Dec 2013 01:17:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CF1302021B for ; Mon, 9 Dec 2013 01:17:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CD1FFAD9A; Sun, 8 Dec 2013 17:17:10 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from caramon.arm.linux.org.uk (caramon.arm.linux.org.uk [78.32.30.218]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D608FACD8 for ; Sun, 8 Dec 2013 16:16:24 -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=y69buOH9BLElZVL7wyOXzmu8AAb6wBirJXT1CBI8ruM=; b=gvl3bCudLr/82OjbRh+HsUev+fXZm8RX//74+DwNL8AReTm3VuaY3WoIED4Qv7BSQ9bL6yuQM+v3ZdTXXSLQDUz9DfTfmhAW1B6e7lVUEmCU0ePBVBiWLj+xQgAJPEdpZnu4XF3LFrSG+7fJWl+PHGC2v8UycdC59X2Rwo8RPaY=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd]:33990 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 1VpoOp-0005mS-Id; Mon, 09 Dec 2013 00:08:35 +0000 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1VpoOo-0000qd-Sc; Mon, 09 Dec 2013 00:08:34 +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 2/4] DRM: Armada: destroy framebuffer after helper Message-Id: Date: Mon, 09 Dec 2013 00:08:34 +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 Destroy the framebuffer only after the helper, since the helper may still be referencing the framebufer at this point. Signed-off-by: Russell King Reviewed-by: Thierry Reding --- drivers/gpu/drm/armada/armada_fbdev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c index 743570e99f90..b348b16f81e2 100644 --- a/drivers/gpu/drm/armada/armada_fbdev.c +++ b/drivers/gpu/drm/armada/armada_fbdev.c @@ -202,11 +202,11 @@ void armada_fbdev_fini(struct drm_device *dev) framebuffer_release(info); } + drm_fb_helper_fini(fbh); + if (fbh->fb) fbh->fb->funcs->destroy(fbh->fb); - drm_fb_helper_fini(fbh); - priv->fbdev = NULL; } }