From patchwork Thu Feb 27 18:15:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11409299 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 194CA13A4 for ; Thu, 27 Feb 2020 18:17:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1519246B2 for ; Thu, 27 Feb 2020 18:17:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Uq0/bPLO"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="jBqiUuXV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1519246B2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ln6yrAtKXWReXmD21j/skOKvhnAH9N5KC8g5QvV3TEM=; b=Uq0/bPLOW5ZzE5 lhmA3Zy1gxcKksbTVnIDSP0Iuuk9l6a1KsNgMpdkwTV/KAw4mrKETmBU8kqZF2/kA9EBnRqgkQGQQ QW0IlktuJo8x4P6pWFf39lCTOUiPh7iIsWiMeW0S7n7Itpp/Pe2/9K7B80ffWhBLUoPrMQeYdWqx9 uAXEvJEr978aETcn2IJW3+MThncuHUkeoKSiwyYwl2mAwjQ1hovRvr3lqNqKpBYjBLouJqVNRQjfj F/VL6WOVjoalSLbQizVbd47sxJOFuroP+Aq9EhZMGiS6aFrv/Qrgg1N9E6Cc+/1KAOeDosE+KOKbZ LUbPZ4u2gzpIjCGcGDlA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7NiR-0003qG-Tf; Thu, 27 Feb 2020 18:16:55 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7Nhp-0003Fv-Tn for linux-rockchip@lists.infradead.org; Thu, 27 Feb 2020 18:16:19 +0000 Received: by mail-wm1-x342.google.com with SMTP id a141so435856wme.2 for ; Thu, 27 Feb 2020 10:16:17 -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 :mime-version:content-transfer-encoding; bh=XH8HTUf+N983dtr3AIooE5hJOMY5xFR/UBpOsmUWfIc=; b=jBqiUuXVh/JvEPipboAuXj5XTLXkZ653TgrBZRVEUYce1lqQQ1NF6ER3HLGYfAX4UB J68ARKFjIsdYaeyLanHA4/nYkX5rdrVqDhN7sfsACMUjAy0f6ePOLt+gEzkEV2Yr4sZ5 YePxoooDN+WrFAdSqT628QgnmFAXltgaUaCrA= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=XH8HTUf+N983dtr3AIooE5hJOMY5xFR/UBpOsmUWfIc=; b=dtZEhJIH/y3TDwlaWL7X/RWu+RE58XrEO6xKPPpaoCIIXiWm+nViE8kck/jmqs5qtX gHLaj6FUFGTgd4CUVZT7sk+iCfvprnQB69ebvaYP0Jk5qecLSXn6Vl5JdQYkqBqrulgG qQmv4u1znPMKz4RIHbDWMQGt47JdUQzgIbP6LWLR5IN/zFz2C9aZ+eU/JMJ0ZLHr/7YP J49SJl87qLemOwsC8i4WeTt5azaY4OWrqCRE2HyR5k1Nx8Mv6yxLrMh02onFg3afrwof FqI5r6P0APuSjQaW7mhUb9qhkChIBrntANs0YCt7XoN5D1OO3MltWphyFwqJbaPVvq/M APrg== X-Gm-Message-State: APjAAAWAauQilpNROUIXCQEhIu99gypIgp52LSL7+k427bE9Bx6O8nJu yxpuoA0tNgVIs76D5kV4nTqeCA== X-Google-Smtp-Source: APXvYqxCJ7pjwNsD57hr7a7J+I8OTlXejrkTgzdaMEIRKxXonn5EVsjHkCo0KzWPeU7M/N12HjkftQ== X-Received: by 2002:a1c:1b4d:: with SMTP id b74mr26180wmb.33.1582827376145; Thu, 27 Feb 2020 10:16:16 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q1sm8551152wrw.5.2020.02.27.10.16.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 10:16:15 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 37/51] drm/rockchip: Drop explicit drm_mode_config_cleanup call Date: Thu, 27 Feb 2020 19:15:08 +0100 Message-Id: <20200227181522.2711142-38-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200227181522.2711142-1-daniel.vetter@ffwll.ch> References: <20200227181522.2711142-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200227_101617_979922_99513EAD X-CRM114-Status: GOOD ( 13.54 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:342 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Heiko_St=C3=BCbner?= , Francesco Lavra , Daniel Vetter , Intel Graphics Development , m.felsch@pengutronix.de, Sandy Huang , linux-rockchip@lists.infradead.org, Laurent Pinchart , Daniel Vetter , linux-arm-kernel@lists.infradead.org, l.stach@pengutronix.de Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org It's (almost, there's some iommu stuff without significance) right above the drm_dev_put(). This is made possible by a preceeding patch which added a drmm_ cleanup action to drm_mode_config_init(), hence all we need to do to ensure that drm_mode_config_cleanup() is run on final drm_device cleanup is check the new error code for _init(). Aside: Another driver with a bit much devm_kzalloc, which should probably use drmm_kzalloc instead ... v2: Explain why this cleanup is possible (Laurent). v3: Jump out at the right label (Francesco) Cc: Francesco Lavra Cc: Laurent Pinchart Signed-off-by: Daniel Vetter Cc: Sandy Huang Cc: "Heiko Stübner" Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Reported-by: kbuild test robot Reported-by: kbuild test robot --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 20ecb1508a22..9b2502f92018 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -135,7 +135,9 @@ static int rockchip_drm_bind(struct device *dev) if (ret) goto err_free; - drm_mode_config_init(drm_dev); + ret = drm_mode_config_init(drm_dev); + if (ret) + goto err_iommu_cleanup; rockchip_drm_mode_config_init(drm_dev); @@ -173,12 +175,9 @@ static int rockchip_drm_bind(struct device *dev) rockchip_drm_fbdev_fini(drm_dev); err_unbind_all: component_unbind_all(dev, drm_dev); -err_mode_config_cleanup: - drm_mode_config_cleanup(drm_dev); +err_iommu_cleanup: rockchip_iommu_cleanup(drm_dev); err_free: - drm_dev->dev_private = NULL; - dev_set_drvdata(dev, NULL); drm_dev_put(drm_dev); return ret; } @@ -194,11 +193,8 @@ static void rockchip_drm_unbind(struct device *dev) drm_atomic_helper_shutdown(drm_dev); component_unbind_all(dev, drm_dev); - drm_mode_config_cleanup(drm_dev); rockchip_iommu_cleanup(drm_dev); - drm_dev->dev_private = NULL; - dev_set_drvdata(dev, NULL); drm_dev_put(drm_dev); }