From patchwork Tue Feb 25 16:44:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 868272 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6007820D510; Tue, 25 Feb 2025 16:44:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740501888; cv=none; b=nIekHB9q4xjOMbcPZCZKCTtjerAeT1AyokwsIEAJ0XoDorzTehjuR5GvUZ7KxVz4tuhrETbn9s3LQ2sEAfNDjeygwDvNycEhKErFnZjBaupKapN/RqaeYYf+ZOB03+fUdTmNAWV6vMWUF4HNQ62chm6BJ8S01c28nUsuxkLJYDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740501888; c=relaxed/simple; bh=umjlhfwoNuI5CMD+RXjw4fLXJjEg7D7r1hkXotSNbkc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bh9sAegd5bMThRxqbGNvmX0t5dGhuhNi51SNX7jWDVCOQZlDePlxi4cJHviIUed1kGMnB84OJXteHP+89xVWUrXquQMfqTcv9rtbv350La9Kc/+n7HonNR5ehHTgqZdfx4uijZ4ubTNHWHN4XbiTTIOhSlYpAMG+oLq2BWTI5og= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MA6MMRDX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MA6MMRDX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 173F6C4CEE8; Tue, 25 Feb 2025 16:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740501887; bh=umjlhfwoNuI5CMD+RXjw4fLXJjEg7D7r1hkXotSNbkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MA6MMRDXJf60FK4j/aDYVV1S55LNYVR3sbzY7LqBlyhkusm3n2iQLV/00Qt8rYsw+ ivHvE5uQfUJr6mbKVXNDQHEjAxqn97j/htT+98MJF9BLikRiPWw5Rx4KeW7ntbPRkY 6sM6RnS0vLcHcRdIaA0ivhhvanQ1wHa9j/1G4gYlmd2BN7XpabxgX79Im3Ht8t9PoA V7Yeh3SXvs2nU/2z7KG/SwS+O1CDrrssV2wtBrNeWH1v2yJPl7cVDHSpeQnTtfrRQl malN7x9n65EHQfH+gWdJRunhE3NdgN6EfURBaF6ha8KskkdVMpwuVt4fOmBgFT+pH4 P6Qfi03dRhHDg== From: Arnd Bergmann To: Greg Kroah-Hartman , Helge Deller , Thomas Zimmermann , Arnd Bergmann , Javier Martinez Canillas Cc: kernel test robot , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] dummycon: fix default rows/cols Date: Tue, 25 Feb 2025 17:44:22 +0100 Message-Id: <20250225164436.56654-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250225164436.56654-1-arnd@kernel.org> References: <20250225164436.56654-1-arnd@kernel.org> Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Arnd Bergmann dummycon fails to build on ARM/footbridge when the VGA console is disabled, since I got the dependencies slightly wrong in a previous patch: drivers/video/console/dummycon.c: In function 'dummycon_init': drivers/video/console/dummycon.c:27:25: error: 'CONFIG_DUMMY_CONSOLE_COLUMNS' undeclared (first use in this function); did you mean 'CONFIG_DUMMY_CONSOLE'? 27 | #define DUMMY_COLUMNS CONFIG_DUMMY_CONSOLE_COLUMNS drivers/video/console/dummycon.c:28:25: error: 'CONFIG_DUMMY_CONSOLE_ROWS' undeclared (first use in this function); did you mean 'CONFIG_DUMMY_CONSOLE'? 28 | #define DUMMY_ROWS CONFIG_DUMMY_CONSOLE_ROWS This only showed up after many thousand randconfig builds on Arm, and doesn't matter in practice, but should still be fixed. Address it by using the default row/columns on footbridge after all in that corner case. Fixes: 4293b0925149 ("dummycon: limit Arm console size hack to footbridge") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202409151512.LML1slol-lkp@intel.com/ Signed-off-by: Arnd Bergmann Reviewed-by: Thomas Zimmermann --- drivers/video/console/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 1c4263c164ce..ea4863919eb9 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -51,7 +51,7 @@ config DUMMY_CONSOLE config DUMMY_CONSOLE_COLUMNS int "Initial number of console screen columns" - depends on DUMMY_CONSOLE && !ARCH_FOOTBRIDGE + depends on DUMMY_CONSOLE && !(ARCH_FOOTBRIDGE && VGA_CONSOLE) default 160 if PARISC default 80 help @@ -61,7 +61,7 @@ config DUMMY_CONSOLE_COLUMNS config DUMMY_CONSOLE_ROWS int "Initial number of console screen rows" - depends on DUMMY_CONSOLE && !ARCH_FOOTBRIDGE + depends on DUMMY_CONSOLE && !(ARCH_FOOTBRIDGE && VGA_CONSOLE) default 64 if PARISC default 30 if ARM default 25