From patchwork Thu Dec 8 11:07:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9466151 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 F267E60231 for ; Thu, 8 Dec 2016 11:07:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBA68284D5 for ; Thu, 8 Dec 2016 11:07:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E08FE28536; Thu, 8 Dec 2016 11:07:47 +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_SIGNED, 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 7BBF7284D5 for ; Thu, 8 Dec 2016 11:07:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B30006E064; Thu, 8 Dec 2016 11:07:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wj0-x242.google.com (mail-wj0-x242.google.com [IPv6:2a00:1450:400c:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4CF4F6E064 for ; Thu, 8 Dec 2016 11:07:39 +0000 (UTC) Received: by mail-wj0-x242.google.com with SMTP id xy5so53910161wjc.1 for ; Thu, 08 Dec 2016 03:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NsULxel11tIbakuF9FQ4ZKO2mjo5FFsUDQjcE+j7dLI=; b=Rh4rBiX7cNCZbKRV668IdDq5gJ8cw8Ks7TknKFLBMMCjNNIjEYkdD4Kho2iqwaq5bQ BeRgXmLn+5RlzPaqeIkYZnyLSP6mjBgk1oP2IT1J2XW8YoIV0pM7vIXTzp6eDGbD/KFQ cPMumVfHHrn1sI1nYu29nyJi4oMip0DBbkqkg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NsULxel11tIbakuF9FQ4ZKO2mjo5FFsUDQjcE+j7dLI=; b=CxxvE2ClEzIbi/FtXc6Cz+RZkwTOMvOgfcvjlTBPxEHVbBm+pG5zKIhpZ9JVrwJS4C 8ttJgC2MOF+i1+HtkJwzQSvKtEUfy05Nh+9MsXwQpnTvg9pkEA6vknje738MGoSPCLfc tfkJoacKJwd60bHl9LFvVLHen7HebogQN5V5Uwxp4SzPWQbcqYOPSNTUE5zdONyGugaE nFOeXLNMLT1bRrOW/Kj3Rz/PVJlygFglWPPFnZrwxrXZ51XdeWe98cjOjnuGENK6H3vt iUM6EhRMOC5/ojIjbbWsuE+5ZHpCMjU5eO0eBomBNy6HaJy5EBpwqqp4YvYxxcK16Cur pVwA== X-Gm-Message-State: AKaTC031ySHrpZZNNyUakEvOyD5duhRABeedW0dChBV90WPYmEcr331vrrNJSZVvvUgMmQ== X-Received: by 10.194.20.34 with SMTP id k2mr58392106wje.9.1481195257458; Thu, 08 Dec 2016 03:07:37 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id yj10sm36462963wjb.3.2016.12.08.03.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Dec 2016 03:07:36 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 4/4] drm/vc4: Don't use drm_put_dev Date: Thu, 8 Dec 2016 12:07:39 +0100 Message-Id: <20161208110739.24417-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161208110739.24417-1-daniel.vetter@ffwll.ch> References: <20161208110739.24417-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter 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 vc4 already has a proper load sequence, but the unload one needed some fixups: First unregister, and last drop the final ref. Cc: Eric Anholt Signed-off-by: Daniel Vetter --- drivers/gpu/drm/vc4/vc4_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 1dab9e5b3689..bfaf4e36f7ae 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -277,12 +277,14 @@ static void vc4_drm_unbind(struct device *dev) struct drm_device *drm = platform_get_drvdata(pdev); struct vc4_dev *vc4 = to_vc4_dev(drm); + drm_dev_unregister(drm); + if (vc4->fbdev) drm_fbdev_cma_fini(vc4->fbdev); drm_mode_config_cleanup(drm); - drm_put_dev(drm); + drm_dev_unref(drm); } static const struct component_master_ops vc4_drm_ops = {