From patchwork Tue Feb 25 16:44:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13990279 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 06DE81A2389; Tue, 25 Feb 2025 16:44:40 +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=1740501881; cv=none; b=dkkIAwEOjW954HFJe87d642EltImTDP81+GADv3OudMcI+pqmicLe6SYu4qKjNhmN/W9ahipU1X8Dlerim/Y1sYLK9FW1Jm6sHXJBDjWWs4PQsZn0HyLG+M31elSC8j8rpRDMHwgbEHqHmTF3zbIt7jallEWLqsT8cViL/MsIFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740501881; c=relaxed/simple; bh=ZX5eNqfG2UfwSXd6a7upCgYYCJX3G4CmXLdSAOkFdSg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=G4Vb8wPFaUGmeSvZiE2QjDFnZu6EM1BlvJ9VpdA46HC+uPwr/p3yl2nrgtoUqB9NUac8RhAWAKDGHywL7LIxwCCo7QghHlYCyuBRHYTNSCdctEn/4RMKcmNhkxCKdzNvjxArF18BDObBTO33maQoaU2LA2djJSqT/FSNLKiUufU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SuNk+zdQ; 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="SuNk+zdQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1971CC4CEEC; Tue, 25 Feb 2025 16:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740501880; bh=ZX5eNqfG2UfwSXd6a7upCgYYCJX3G4CmXLdSAOkFdSg=; h=From:To:Cc:Subject:Date:From; b=SuNk+zdQlyrpthP0q5lo3IgJRdelSpuQfAw3eUDvMCuvc3oczkl84KZsDd0KMNZfk y86wUN5PYNfThF0Z8diUpfOyllDDJoJvm14DlAFKGpdQx6vVngAvcZr+ip6IJiXJ/t cZ3VpsqFPJGHK44Q+yxJJGBipYOaybJ0nJiIDzVNpd94Q4vM10Bxoe1JwLJJTHrGqF fEbmXuA0KKGVQ2V79J2UiHMjpuVx0DCYR0UddJGpG0aFvg7Cqn6LH5FKel9R6wpMpd YJXF7Oa3Z5ES2Wn1LRO6j18IM3Y4i8Q00+9QPyvgpyEEHv0OG5t5wTUW7oiyXIX2ic efdrgUHKDy8nQ== From: Arnd Bergmann To: Greg Kroah-Hartman , Helge Deller Cc: Arnd Bergmann , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] dummycon: only build module if there are users Date: Tue, 25 Feb 2025 17:44:21 +0100 Message-Id: <20250225164436.56654-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Arnd Bergmann Dummycon is used as a fallback conswitchp for vgacon and fbcon in the VT code, and there are no references to it if all three are disabled, so just leave it out of the kernel image for configurations without those. Signed-off-by: Arnd Bergmann Reviewed-by: Thomas Zimmermann --- drivers/video/console/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index bc31db6ef7d2..1c4263c164ce 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -47,8 +47,7 @@ config SGI_NEWPORT_CONSOLE card of your Indy. Most people say Y here. config DUMMY_CONSOLE - bool - default y + def_bool VT || VGA_CONSOLE || FRAMEBUFFER_CONSOLE config DUMMY_CONSOLE_COLUMNS int "Initial number of console screen columns" 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: 13990280 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 From patchwork Tue Feb 25 16:44:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13990281 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 41D441A2C0B; Tue, 25 Feb 2025 16:44:54 +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=1740501894; cv=none; b=nUmzArNNdIvDqF1A6DP74nKhDAmADOl//SJad/RduHenT9f4b/OUQgAEHUUSgb+BIWGslwKlDGvA9LslgbLF0xnx2ocJwac+fIuOoYL66l3Mwtekkv0Ba9tdfSfw9bDjw9jFbGd3gBCRkNKlt3ndfRwBJnOP05xgpD7cs3aHNdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740501894; c=relaxed/simple; bh=UYE7SvQD/nIFAX3j6zK9BtdqY4cgGf7VK4pQLi2P6ys=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vGGSnJIifHjbNK5f8VZZjknmWOzZHu4oRIINIb0aQM67JgZbaSkpyXwbga7M7wh4WTj+dVmr0KDCJ3U5T7yZTh+LJBNm3bE7dUlBFlLm2CD608ToPbUX5EsR9z0Uz7uEqgFFP+YrCOe9h0isRiIzogOyr1SvlB9XVoyPvCrGQ3k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bag9zb0Z; 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="Bag9zb0Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 738C5C4CEE6; Tue, 25 Feb 2025 16:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740501894; bh=UYE7SvQD/nIFAX3j6zK9BtdqY4cgGf7VK4pQLi2P6ys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bag9zb0Zg01oG7D/DlGyb9g3yfYPFy42vrOxJqyYQb3xlDSkDTZJUooKtuGqVOUDM GPUrviQ222kX/TL1gk97TI5SMaXAZALE+VNCj7NARsr15a03NVDh7stHEs1/rBEf1g qo6YU8qADy+UzgMevlR4DjE7SfHEGPhOjoipANVNXnOEDIqF9QhKR79SP0wG5gdK1K 0k1UaQC3JfVa69e893o+Ic9zAQ4hZPM7wCtzfrCMp2qcucdBQdultYFU01rYfHSIiX GW6Qc+4bALAszG97MLeM8TvII6oLwR87PLBMkaSxGjoO7s1gobmGwJL/2SQYkJ2N1g FN3PRgLeWrCtQ== From: Arnd Bergmann To: Greg Kroah-Hartman , Helge Deller , Roland Kletzing , Andrew Morton Cc: Arnd Bergmann , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] mdacon: rework dependency list Date: Tue, 25 Feb 2025 17:44:23 +0100 Message-Id: <20250225164436.56654-3-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 mdacon has roughly the same dependencies as vgacon but expresses them as a negative list instead of a positive list, with the only practical difference being PowerPC/CHRP, which uses vga16fb instead of vgacon. The CONFIG_MDA_CONSOLE description advises to only turn it on when vgacon is also used because MDA/Hercules-only systems should be using vgacon instead, so just change the list to enforce that directly for simplicity. The probing was broken from 2002 to 2008, this improves on the fix that was added then: If vgacon is a loadable module, then mdacon cannot be built-in now, and the list of systems that support vgacon is carried over. Fixes: 0b9cf3aa6b1e ("mdacon messing up default vc's - set default to vc13-16 again") Signed-off-by: Arnd Bergmann Reviewed-by: Thomas Zimmermann --- I have no idea when the last time was that someone actually tried using dualhead vgacon/mdacon with two ISA cards, or if it still works. We may be better off removing the driver altogether, but I don't see anything immediately wrong it with it. --- drivers/video/console/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index ea4863919eb9..12f54480f57f 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -24,7 +24,7 @@ config VGA_CONSOLE Say Y. config MDA_CONSOLE - depends on !M68K && !PARISC && ISA + depends on VGA_CONSOLE && ISA tristate "MDA text console (dual-headed)" help Say Y here if you have an old MDA or monochrome Hercules graphics