From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 30C79C4742C for ; Thu, 5 Nov 2020 13:59:12 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 9C8A520782 for ; Thu, 5 Nov 2020 13:59:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cKPRwYcx"; dkim=temperror (0-bit key) header.d=cerno.tech header.i=@cerno.tech header.b="IISv2sIy"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="fXXZegtI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C8A520782 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=xDTMGLlF6PqdAXbfFkmn3UcS+WlzDgWw13qtSi9Xjzk=; b=cKPRwYcxgytrz66hcdRXttOkr Dyr6ou7k957A4tQ68N0QqOcUnV0/lHtWACjXLgqweEKJUrO/DM32Boscf6ys5LwyiGtVcO5s0d0el /1xdNtAHEi/3JYA+7UYTbLHig6vpQwx5EXw7RQ+MuUPcDZoxyho9fMFPWjtbBHLV7UX1RrU8YPo8o kUzvQUhH11buN4DPzxZbduQBRvPRsGCTuRZ/Wi8SmFljHoDGFLdqEYELMrOnlgkbAp1H+68InY6LF /A8WF8XD25SyQVSJaiIqYHutiLIqR5SCt0pcKINMBGB8uuYdqBRX9nWi2zCnRZBAmV4bQLPT55i6B +rlACd5oA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaflS-0003gm-HJ; Thu, 05 Nov 2020 13:57:23 +0000 Received: from new3-smtp.messagingengine.com ([66.111.4.229]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaflC-0003Zn-JX; Thu, 05 Nov 2020 13:57:10 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id E198558034C; Thu, 5 Nov 2020 08:57:00 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 05 Nov 2020 08:57:00 -0500 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=1qbN14mIek/JX 3iS6saTd4OgwKK38+e/znp9ftVsrwE=; b=IISv2sIydF7hazIS49pvAg/DQeDg+ HC6ciFEvlazhKxULi/ZsxJYxzkY5rGmB0qJAXDEitcmgU2ZPlFqhuLFFt8XN2RZq +1vr4taT00MHXxZE220SJg5+eE+sdpXwpsT5ySEqYGktE3jz88/GnONGAu3x30F4 AWyjy6sgpqlS5Pf9aLZ6HyrMe8z+LW0eklF+JkrStwx+ZfAnfwj5FhZofgnYMf/j 4fsMj1hhzfcemS+KziRouPy83yio2M72MWubMlnzbrhifCpZYvHJli4WYAYZcxDx ynZXXh687+hLKSyNcLXMC3S7+UfoWXpTDL8JoPmD4DPh3HZFriIMzKUBw== 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=1qbN14mIek/JX3iS6saTd4OgwKK38+e/znp9ftVsrwE=; b=fXXZegtI VZQUBXr9e1cy83HC0EngeA/hSJEQ7yIRKNFEUduOZz/5wIDuujKfcIfWwnB0gZm5 qAhnpeOCjKrXBJYbs8rgofiWx6YBKyW+JHlcDKZIF6U4Q1qgGA9MI3lVjdm7euo2 80WHGo9NNb0VW79a90ze0/TdyRYYWbRL28jjCwFMByXwurgr2Ksfy6w8IR32pjFA eN0AXkczJDl3YOHaQOFcRbPm5eQsESg/Wq8j4vh7pSFQBLrtDruhMeigQx5Pd5Fv wQLZWGEqKOvZOptXYZql4a+kARqKsptlSXeiAzT8iGOaMuwMHEPiuD0jbCcbaNX6 2o8PFNBpE4V9Yw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddtjedgheelucetufdoteggodetrfdotf 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 578C2306005C; Thu, 5 Nov 2020 08:57:00 -0500 (EST) From: Maxime Ripard To: Eric Anholt , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Daniel Vetter , David Airlie , Mark Rutland , Rob Herring , Frank Rowand Subject: [PATCH v3 1/7] drm/vc4: kms: Switch to drmm_add_action_or_reset Date: Thu, 5 Nov 2020 14:56:50 +0100 Message-Id: <20201105135656.383350-2-maxime@cerno.tech> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201105135656.383350-1-maxime@cerno.tech> References: <20201105135656.383350-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201105_085706_957063_95D5D30F X-CRM114-Status: GOOD ( 14.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Tim Gover , Dave Stevenson , dri-devel@lists.freedesktop.org, Hoegeun Kwon , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Phil Elwell , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Even though it was pointed in the review by Daniel, and I thought to have fixed it while applying the patches, but it turns out I forgot to commit the fixes in the process. Properly fix it this time. Fixes: dcda7c28bff2 ("drm/vc4: kms: Add functions to create the state objects") Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_kms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index 2b951cae04ad..44db31e16e91 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -113,7 +113,7 @@ static int vc4_ctm_obj_init(struct vc4_dev *vc4) drm_atomic_private_obj_init(&vc4->base, &vc4->ctm_manager, &ctm_state->base, &vc4_ctm_state_funcs); - return drmm_add_action(&vc4->base, vc4_ctm_obj_fini, NULL); + return drmm_add_action_or_reset(&vc4->base, vc4_ctm_obj_fini, NULL); } /* Converts a DRM S31.32 value to the HW S0.9 format. */ @@ -657,7 +657,7 @@ static int vc4_load_tracker_obj_init(struct vc4_dev *vc4) &load_state->base, &vc4_load_tracker_state_funcs); - return drmm_add_action(&vc4->base, vc4_load_tracker_obj_fini, NULL); + return drmm_add_action_or_reset(&vc4->base, vc4_load_tracker_obj_fini, NULL); } #define NUM_OUTPUTS 6 -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel