From patchwork Wed Dec 15 09:51:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12696223 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 DDDBFC433EF for ; Wed, 15 Dec 2021 09:53:26 +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=6xQta2wb7JZwDzheUK7dvMXo+QQLqx0gUozc2WZh8w4=; b=ifl2r1DHwojS4+ v7I0RG5hAKAwT8VVg6O96TUB1fXVdqsMscQrQkJDV1gKDm6MGSUdlSXxjFuMwjj3zlKjw5gnuTv8f CWMdXjYgTA4k67n6kLOcGk5vgERmuYZGL1LaRkAemTThPxcYsFTrRM0WJc/i9Ln3rA4N/K2OoWKHQ 7JJzNWpWY+eRouDVWjgqGEaEg+LrsgEuxUqZkzB4+Qxafyv1F8S3DQcd8JYHmHUqJmUbV7D8uWz3F COlzv5lW8/ZV3hi+H7JppUsVFNcwUaqepxplvxB1oRZU7HTOf6lMr6X4+f9z/acxO+3prcBss3+qm iuV6rLxyfHs9DsGk6gMw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxQx2-00HaYj-CA; Wed, 15 Dec 2021 09:51:56 +0000 Received: from new2-smtp.messagingengine.com ([66.111.4.224]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxQwX-00HaGt-Pz; Wed, 15 Dec 2021 09:51:27 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id 0E1CA580152; Wed, 15 Dec 2021 04:51:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 15 Dec 2021 04:51:25 -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=1H6NDako2j0Yo SdZSzMJDj+RXSZgat1EU93Whc14SYU=; b=a5wjuX893CbfOQzVfQWl+IVLB+Eav K9IhSaFZv2sWkTu8InjZZIcXRUadWqvkCTsvA7eK6Vk0pIAJyhQAG1mXHTYdccEL hjKyiOAsgt+N8Tf/09LqptW84jtiFSGfY47sPF8QkS0uBBe0ymLFDi7eAS5D94Xw bXmwrIPLrjv8oCDdT29fq5ZoKdklCitXaCgKRhU/gPqFBLeip6KAAfmJKvkBU8YS DraBY1GxJK5ZfOeb18CQn4/+bvgFERCQEBjM/VQz7MbIXcp1XKbGx2h1OKCloLDA 6ZvSVWjTJDTNhdsajz/z6fSxy11iook8X5Upb6r5zmOTKFiG39+iYYVPA== 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=1H6NDako2j0YoSdZSzMJDj+RXSZgat1EU93Whc14SYU=; b=JeFHN5of 9Ho38MYMUTPPfISw3mt34c140YK+vzQn/Sk7I2EJGQrBWUqQFRK9kkrGbMzUblkN da7EWHV3QAeukJj/XyEiPEAmaM4ELfHlCAEW4oRJp9hp43kPepglPHWPTsNTZ3NM fB/85CCEmbRS9EI/6ctOHdTqawu8cc6ZachRm1N65T+C19ytPqBZ4gqB1Z9tiR3K czPeni0kR7nFvHb4VGRJB+hbR1NXSM5ltwNmCFekdUlemgjOXija7lqCR1HbPeIl 5YCTmxo+nqC75yghrKgP8ztVbHPydu/s/b2r+qYnP9tOHIyvVY3KzTdAKIJ84pWY VxIvqfFGCsFHXA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrledvgddtlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrgihimhgv ucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrghtth gvrhhnpedvkeelveefffekjefhffeuleetleefudeifeehuddugffghffhffehveevheeh vdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrg igihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Dec 2021 04:51:24 -0500 (EST) From: Maxime Ripard To: Florian Fainelli , Ray Jui , Nicolas Saenz Julienne , Daniel Vetter , David Airlie , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Scott Branden , Rob Herring , Frank Rowand Cc: bcm-kernel-feedback-list@broadcom.com, Dave Stevenson , Phil Elwell , Tim Gover , Dom Cobley , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH RESEND v4 v5 2/4] drm/vc4: Support nomodeset Date: Wed, 15 Dec 2021 10:51:15 +0100 Message-Id: <20211215095117.176435-3-maxime@cerno.tech> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211215095117.176435-1-maxime@cerno.tech> References: <20211215095117.176435-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211215_015125_970280_9F80C865 X-CRM114-Status: GOOD ( 11.29 ) 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 If we have nomodeset on the kernel command line we should have the firmware framebuffer driver kept as is and not try to load the full-blown KMS driver. In this case, let's just register the v3d driver. Signed-off-by: Maxime Ripard Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/vc4/vc4_drv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 16abc3a3d601..d3cae84a4c4e 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -357,6 +357,9 @@ static int __init vc4_drm_register(void) { int ret; + if (drm_firmware_drivers_only()) + return -ENODEV; + ret = platform_register_drivers(component_drivers, ARRAY_SIZE(component_drivers)); if (ret)