From patchwork Mon Dec 13 16:26:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12695942 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A7340C433F5 for ; Mon, 13 Dec 2021 16:29:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Rz6GEetHlnEf9wPulqwhuW0TrWzv43dY6ia2SCLO1QQ=; b=tDTRZSm18WJMOK Uq8iDK8wWmX3ZSN35eWrBLy6w2fpageTJ3RqsX2RcYOKnTi+tNE/VdvYxQYgzJKHye8KJHMcpE4zE VFBCeXJRiVGuWF8Pdzb91CFlDBV+mHRtFGgXevs2R4jGlEiz4kc5o6T9mrdL8Upji8piYmkGT9fKd +Sso+56ezKxdqFhyvJ6G+NVQirIpKsRG2FluFgzqd4SaMYUfDknZ1RHUWiB6NO77ewrH8OhyyuZYg 67ItLS+HgkWgIizh/qRYTbGEJ/z5Sv5rtb9HDl/ezK78aWnwTzd57o4CfcvMCv1oeMfrKaMkfU6jt o9Du95/rNcSviZ+PKIMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwoB5-00AaP1-2A; Mon, 13 Dec 2021 16:27:52 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwoA0-00Aa0e-RG; Mon, 13 Dec 2021 16:26:46 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 1FBE65801BD; Mon, 13 Dec 2021 11:26:44 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 13 Dec 2021 11:26:44 -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=5jXA/kJUnHNXe i3kWYCHbhB8LRX/fvUqDJgIAUMTB+s=; b=E9NpO9pMbcAk5CJRneUJd3Vq3yOTN O+3EzJRaWwkOslq8Z3Pvqa+f33eDh8g0kcJXCL8soucOF4tG/+vfptp+86IvJY24 dojIz01oWxUszjkeZhPRIAd1HxFAyjs4rggHG8CmjsX1dIsVMPqvefmH9MbpKXoF J7EiykSXaLE4iRdvLaXMWyVLOeMvSIX7o8Gs7rJsS3CugjbE/TWTAT3MjHDhix/3 wqF4dnRCsHUBWVLCmBn4O0xZI86WJsKhOgzUJ0JzkwZtEjMQXfDdT/PaIHhx+y14 22MiiNn89PhO96uFZke+jlu13QxV5IZctLR7RLVb+IaSB6aPrp2zdnTqA== 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=5jXA/kJUnHNXei3kWYCHbhB8LRX/fvUqDJgIAUMTB+s=; b=gbUsM7uW 70COHYLi08uXT33wlV0bDGx1ZER5tfJjYTUw/X/m43OZ29MBEHNP6fuKLpHOOr8S 2OX0aeDWOocffS2UjZ6CRRklA+67WuHs7ROMMSb+jXUWWsay1eZVJTQMarGUgkJe S0CNykh2M3RH1KR8J9z1toLsDkF14YOWfE499DujGnc3Em5gSi+65HrhVwnQxw83 ImEY8B68jsAWxpdRGB8x+M8FtZnj5rrkMmQGiOPp4hPHILRc2cpeA3hMvrk8fnZV WXT+CTo7j4u/uJs5a+tFXmCVx+LYBJbUyymMqB8w7ZUzQHHgaheiSwmsvdpw2+/G MuQoaPTXVezQZA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrkeekgdeklecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrgihimhgv ucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrghtth gvrhhnpedvkeelveefffekjefhffeuleetleefudeifeehuddugffghffhffehveevheeh vdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrg igihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 13 Dec 2021 11:26:42 -0500 (EST) From: Maxime Ripard To: Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Daniel Vetter , David Airlie , Florian Fainelli , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Frank Rowand , Ray Jui Cc: Dave Stevenson , Phil Elwell , Tim Gover , Dom Cobley , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH RESEND v4 v4 3/4] drm/vc4: Remove conflicting framebuffers before callind bind_all Date: Mon, 13 Dec 2021 17:26:34 +0100 Message-Id: <20211213162635.252582-4-maxime@cerno.tech> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211213162635.252582-1-maxime@cerno.tech> References: <20211213162635.252582-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211213_082645_004898_9F30D89C X-CRM114-Status: GOOD ( 10.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The bind hooks will modify their controller registers, so simplefb is going to be unusable anyway. Let's avoid any transient state where it could still be in the system but no longer functionnal. Acked-by: Nicolas Saenz Julienne Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 12694e2201e7..c0d7e510694f 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -251,6 +251,10 @@ static int vc4_drm_bind(struct device *dev) if (ret) return ret; + ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver); + if (ret) + return ret; + ret = component_bind_all(dev, drm); if (ret) return ret; @@ -259,10 +263,6 @@ static int vc4_drm_bind(struct device *dev) if (ret) goto unbind_all; - ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver); - if (ret) - goto unbind_all; - ret = vc4_kms_load(drm); if (ret < 0) goto unbind_all;