From patchwork Thu Oct 29 19:01:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11868701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A17A0C55179 for ; Fri, 30 Oct 2020 08:24:05 +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 39A6922210 for ; Fri, 30 Oct 2020 08:24:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39A6922210 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech 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 CD1DF6E98B; Fri, 30 Oct 2020 08:23:19 +0000 (UTC) Received: from new1-smtp.messagingengine.com (new1-smtp.messagingengine.com [66.111.4.221]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7C7066E8E5 for ; Thu, 29 Oct 2020 19:01:12 +0000 (UTC) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id 4CAE75807F6; Thu, 29 Oct 2020 15:01:09 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 29 Oct 2020 15:01:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=JzhV3jRhjKlTX DGRyjQ2prXEQjuxY/0Q7cDwYyAFExU=; b=UzG5aB846MQ+usSbmofBEVZGKgYAp +5paGAfcETsE+M6TlYjSV+MJYHJU2kPgKvomOoJmIgYAFgDFiU7aaMBfyaL/ldjk E+Uttl2mDaSNsw3GPIWlL6gjQ4oPdVADcpVT+sgjJtR3tuODpbY5hxWrTnOy7PDC uRMaCVFYyETkGJQX/RdYVwiK0ijGlfmx06nK7OaoasY3Ye5CdiTG+CEQRbrun28/ NlYmQhyUWloRAzzOSMQ1F0TJ2ezuglGWv2h7mU0jbASBmY1jCkRW9XADUo+922SR fKGK0YQL2zagA4SGeAL1y4ESinNLAO4/nNA3IAU/bW3hJ8kXCB2zSyUnA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=JzhV3jRhjKlTXDGRyjQ2prXEQjuxY/0Q7cDwYyAFExU=; b=nBAgJL8Q hbqnjtIu5brdJQqHX2eDBzhRIP9RDYbT/vTge9F3Ej7KQRuPYMp9BqSCBT9373me ti3ncJwkUdpErUIJLyVFlaWxmNcYX/Q+9sz3e6uCNE+xbPY6kCpBFi8KAM2wrVBb qwC02ZLlvKekoFYHKCeM3bS5+Nt5vzhQQuQrA+t3JtKZCYV2hZtvCrvvxU79B0+j wZD40oJH684/cKUbKWskL+Am7pVCfS88IsUEmqqP79aVF/SPK+M1BhUcWJJJ89ia vzHNxk5kaD6qOv4YfMeyk8FsZf6j2u7DQibHOWicJLv9VDMkVkl/Q7uVKqnJGAUQ vlugcGIbdaw00g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrleefgdduudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecukfhppeeltddrkeelrdeikedrjeeinecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA id AC90D3064610; Thu, 29 Oct 2020 15:01:08 -0400 (EDT) From: Maxime Ripard To: Daniel Vetter , David Airlie , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Eric Anholt Subject: [PATCH 2/6] drm/vc4: drv: Use managed drm_mode_config_init Date: Thu, 29 Oct 2020 20:01:00 +0100 Message-Id: <20201029190104.2181730-2-maxime@cerno.tech> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201029190104.2181730-1-maxime@cerno.tech> References: <20201029190104.2181730-1-maxime@cerno.tech> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 30 Oct 2020 08:23:17 +0000 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: linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Dave Stevenson Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Using drmm_mode_config_init instead of drm_mode_config_init allows us to cleanup a bit the error path. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_drv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index eb3fcd8232b5..0bcc541486a9 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -269,7 +269,9 @@ static int vc4_drm_bind(struct device *dev) if (ret) goto dev_put; - drm_mode_config_init(drm); + ret = drmm_mode_config_init(drm); + if (ret) + goto dev_put; vc4_gem_init(drm); @@ -302,7 +304,6 @@ static int vc4_drm_bind(struct device *dev) component_unbind_all(dev, drm); gem_destroy: vc4_gem_destroy(drm); - drm_mode_config_cleanup(drm); dev_put: drm_dev_put(drm); return ret; @@ -317,8 +318,6 @@ static void vc4_drm_unbind(struct device *dev) drm_atomic_helper_shutdown(drm); - drm_mode_config_cleanup(drm); - drm_atomic_private_obj_fini(&vc4->load_tracker); drm_atomic_private_obj_fini(&vc4->ctm_manager);