[PATCH 2/3] dummycon: fix default rows/cols

[Thomas Zimmermann]

Am 25.02.25 um 17:44 schrieb Arnd Bergmann:
> From: Arnd Bergmann <arnd at arndb.de>
>
> 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 <lkp at intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202409151512.LML1slol-lkp@intel.com/
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>

Reviewed-by: Thomas Zimmermann <tzimmermann at suse.de>

> ---
>   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

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)