From patchwork Mon Mar 2 22:26:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11416645 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 0225814B4 for ; Mon, 2 Mar 2020 22:28:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 D1D9B20866 for ; Mon, 2 Mar 2020 22:28:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="PLIgMKZp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1D9B20866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B3FC6E8C7; Mon, 2 Mar 2020 22:27:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id BF6A76E8AF for ; Mon, 2 Mar 2020 22:27:25 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id r7so1902816wro.2 for ; Mon, 02 Mar 2020 14:27:25 -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=j+dtsY1gAvr/pDMBzXSCKBfygWCW7gwbjj3jWxvZJ84=; b=PLIgMKZpgJli5qhjTQbdsjnNMb2LPVj5+pmqzci1/9Err8E0SJ5GVTLc80KQMhMSaw SzVnaS/EVYF0LtQxaqyELcYmIZQBOW30625uKvslydpsAxELb6TLcMX6WkGuM3vSTLcz N+/OgBm/PsposYJjHwaaqmHNRIaeKTHT7pato= 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=j+dtsY1gAvr/pDMBzXSCKBfygWCW7gwbjj3jWxvZJ84=; b=BUAcnZF54pQ8nuw3tPg2kboONH5jcyCNTBauKcolpsep9IgJjzkOA4hwDzh88/xjMx aks+igbeDykYcrE1GQIQkTt/uKPF1gaAvXCvwfGmPUgYehV9RHx1RqS9v2BD+0xdIyG1 RjZWGDs0+3W+E8tLho8gFpbgYgvQEEukgKVBDIFQbbfdIF9QSXDhQdogycUEBX7ysB5u j/N7V1PhWP4S6J9mFC7Tl4rrBD23OvoeGyzyWBCfBiHGTWhcQi0JklHqcgDwSVhFbBS0 KzBLJ4Ugl56FAS1Y0tPnrzcSYyw0ctkdfbrdGEdPLKeHUEhAkx1aXSO9iaePjOYxZUrY wJCQ== X-Gm-Message-State: ANhLgQ2383yDVi4ytFaKo1qJcbU0PdqX0amKAExXq5Wpshfi8Slwozud jyj/WsCeGvJadxT1eMyI1vWHGUMCsxk= X-Google-Smtp-Source: ADFU+vu5caVVHZxO0vZoWJX/t7isTNUjlblhFT9uVut57NHMk22IQMY46VnejPG3fFGLwBTkYVKdjw== X-Received: by 2002:a5d:4043:: with SMTP id w3mr1659295wrp.139.1583188044132; Mon, 02 Mar 2020 14:27:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 14:27:23 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 35/51] drm/pl111: Drop explicit drm_mode_config_cleanup call Date: Mon, 2 Mar 2020 23:26:15 +0100 Message-Id: <20200302222631.3861340-36-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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Laurent Pinchart , Thomas Zimmermann , Daniel Vetter , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's 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: This driver gets its devm_ stuff all wrong wrt drm_device and anything hanging off that. Not the only one unfortunately. v2: Explain why this cleanup is possible (Laurent). v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas) Cc: Sam Ravnborg Cc: Thomas Zimmermann Cc: Laurent Pinchart Signed-off-by: Daniel Vetter Cc: Eric Anholt Acked-by: Sam Ravnborg --- drivers/gpu/drm/pl111/pl111_drv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index aa8aa8d9e405..f9ca0f3edbbb 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -90,10 +90,13 @@ static int pl111_modeset_init(struct drm_device *dev) struct drm_panel *panel = NULL; struct drm_bridge *bridge = NULL; bool defer = false; - int ret = 0; + int ret; int i; - drm_mode_config_init(dev); + ret = drmm_mode_config_init(dev); + if (ret) + return ret; + mode_config = &dev->mode_config; mode_config->funcs = &mode_config_funcs; mode_config->min_width = 1; @@ -154,7 +157,7 @@ static int pl111_modeset_init(struct drm_device *dev) DRM_MODE_CONNECTOR_Unknown); if (IS_ERR(bridge)) { ret = PTR_ERR(bridge); - goto out_config; + goto finish; } } else if (bridge) { dev_info(dev->dev, "Using non-panel bridge\n"); @@ -197,8 +200,6 @@ static int pl111_modeset_init(struct drm_device *dev) out_bridge: if (panel) drm_panel_bridge_remove(bridge); -out_config: - drm_mode_config_cleanup(dev); finish: return ret; } @@ -343,7 +344,6 @@ static int pl111_amba_remove(struct amba_device *amba_dev) drm_dev_unregister(drm); if (priv->panel) drm_panel_bridge_remove(priv->bridge); - drm_mode_config_cleanup(drm); drm_dev_put(drm); of_reserved_mem_device_release(dev);