From patchwork Mon Mar 2 22:26:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11416585 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 E132A17E0 for ; Mon, 2 Mar 2020 22:27:52 +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 AF9A924673 for ; Mon, 2 Mar 2020 22:27:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="s+M31LmB"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="eWpy+GEx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF9A924673 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=bLCCnLH1v5+MAZUYcnpclfsgLaw/6lrCsSqMEFwYOSI=; b=s+M31LmBxrUoeo 1enLOHwb9aFYQn56q6KcR0hk8QVGQjxdwG6fiuxrLqNh7QW2kvWwT+i4mP8g6AfUQNA4ObTkTr0om 1HszifhWO147xE7ohV+jCjmyS2LUcGuCyWK9+kYriqrPbygvPGbkXyX6CZuuwdWev7I4vwELvLAp/ bu8U9kpgQ25qQymRW+ISwv+KjaGh+vRCF6ya8mz1qDrGNLRyTp0u+IQ+PuXdousgeubzKz6XKlq3H 2h6QdhcRRL0qD81bTHjRuhoVGR/GaWfthZ6UR+tXVS0wUyfZOZM0oNTcC5OPzgYojdqY0d5FSRhRl 0Tc5t02HqzDswB9hAJ3A==; 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 1j8tXP-0003pI-8i; Mon, 02 Mar 2020 22:27:47 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j8tX6-0003Pi-8k for linux-rockchip@lists.infradead.org; Mon, 02 Mar 2020 22:27:29 +0000 Received: by mail-wr1-x443.google.com with SMTP id r7so1902892wro.2 for ; Mon, 02 Mar 2020 14:27:27 -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=c6tQ9MfFxj9jmviVv9z34bxHB/dMfgbPWkMep8z10wQ=; b=eWpy+GExBDRswlCzQY7yz9eJf/6doLzIO5unWFveEZL6bVl2ufR9Hb3h2iH+2l/oBz IhoMEvy+q0Fi2INP+gej+Byaupa5PJBIHxBvfeJ26p7uMs3NZd7SNteI1O8mE+CSy5Is RfxvJ8QMdhmYkvnKScOjpffWDGbB+r27UuxiY= 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=c6tQ9MfFxj9jmviVv9z34bxHB/dMfgbPWkMep8z10wQ=; b=dM2YFyEWlRoeoqW1AClL+ecZsIQAMxQKAECREnwEz13kX7155/alRrvTqh2DWPuxU5 BpkNpJpoXa53HEd4L+6xIQ/MUaHXD25Z8Z8xXT0n4BsKi0CM12oZuMgcGbTbhSNQg17g /QhegIZuZQ24SnfFLbGIAGEy5G+NZJvm3F9Xh04WTzYVAkJdbESmSiWlUqBiaNLtlWSy Amdvey2nP/41UqEmAltB12QfOQiTnq0P5szHwTKCcGrNBJyXMf8hTchfpMTP+1CHYaKr cy1I4Qmm2Gb+iHe10X4e2uJi1YvlHXgiuNfnRgZVoWuzcrmRP3994Q6JdVQapv5s59iy yT/A== X-Gm-Message-State: ANhLgQ2ULaLbv0dOFjPlj5q1wd/Wsz/9S+FhaQmgymRhWYtb7LlJrp6e r/puxNy46XbvlHGzF54NjZejAUSfhSo= X-Google-Smtp-Source: ADFU+vupqTzURou/OSClNH9R3NF9co6OO3jTTZgj3hkys1nhGZbZruexIMOoQ0MvxWicN02s2Rwrsg== X-Received: by 2002:a5d:4384:: with SMTP id i4mr1598274wrq.396.1583188046376; Mon, 02 Mar 2020 14:27:26 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id o18sm26114589wrv.60.2020.03.02.14.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 14:27:25 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 37/51] drm/rockchip: Drop explicit drm_mode_config_cleanup call Date: Mon, 2 Mar 2020 23:26:17 +0100 Message-Id: <20200302222631.3861340-38-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> References: <20200302222631.3861340-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-20200302_142728_343390_BE27D72B X-CRM114-Status: GOOD ( 14.57 ) 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:443 listed in] [list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 -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 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 , Sandy Huang , linux-rockchip@lists.infradead.org, Laurent Pinchart , Thomas Zimmermann , Daniel Vetter , Sam Ravnborg , linux-arm-kernel@lists.infradead.org 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) v4: Try again, kbuild caught that I didn't build test this properly ... v5: Use drmm_mode_config_init() for more clarity (Sam, Thomas) Cc: Sam Ravnborg Cc: Thomas Zimmermann 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 Acked-by: Sam Ravnborg --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 20ecb1508a22..0f3eb392fe39 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -135,14 +135,16 @@ static int rockchip_drm_bind(struct device *dev) if (ret) goto err_free; - drm_mode_config_init(drm_dev); + ret = drmm_mode_config_init(drm_dev); + if (ret) + goto err_iommu_cleanup; rockchip_drm_mode_config_init(drm_dev); /* Try to bind all sub drivers. */ ret = component_bind_all(dev, drm_dev); if (ret) - goto err_mode_config_cleanup; + goto err_iommu_cleanup; ret = drm_vblank_init(drm_dev, drm_dev->mode_config.num_crtc); if (ret) @@ -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); }