drm/log: select CONFIG_FONT_SUPPORT

[PATCH] drm/log: select CONFIG_FONT_SUPPORT

Posted by Arnd Bergmann 1 year ago

From: Arnd Bergmann <arnd@arndb.de>

Without fonts, this fails to link:

drivers/gpu/drm/clients/drm_log.o: in function `drm_log_init_client':
drm_log.c:(.text+0x3d4): undefined reference to `get_default_font'

Select this, like the other users do.

Fixes: f7b42442c4ac ("drm/log: Introduce a new boot logger to draw the kmsg on the screen")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/clients/Kconfig | 1 +
 lib/fonts/Kconfig               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/clients/Kconfig b/drivers/gpu/drm/clients/Kconfig
index c18decc90200..7b81fd0f4cae 100644
--- a/drivers/gpu/drm/clients/Kconfig
+++ b/drivers/gpu/drm/clients/Kconfig
@@ -77,6 +77,7 @@ config DRM_CLIENT_LOG
 	select DRM_CLIENT
 	select DRM_CLIENT_SETUP
 	select DRM_DRAW
+	select FONT_SUPPORT
 	help
 	  This enable a drm logger, that will print the kernel messages to the
 	  screen until the userspace is ready to take over.
diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
index 3ac26bdbc3ff..ae59b5b4e225 100644
--- a/lib/fonts/Kconfig
+++ b/lib/fonts/Kconfig
@@ -10,7 +10,7 @@ if FONT_SUPPORT
 
 config FONTS
 	bool "Select compiled-in fonts"
-	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE || DRM_PANIC
+	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE || DRM_PANIC || DRM_CLIENT_LOG
 	help
 	  Say Y here if you would like to use fonts other than the default
 	  your frame buffer console usually use.
-- 
2.39.5

Re: [PATCH] drm/log: select CONFIG_FONT_SUPPORT

Posted by Jocelyn Falempe 1 year ago

On 12/12/2024 16:39, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Without fonts, this fails to link:
> 
> drivers/gpu/drm/clients/drm_log.o: in function `drm_log_init_client':
> drm_log.c:(.text+0x3d4): undefined reference to `get_default_font'
> 
> Select this, like the other users do.

Thanks for the fix, I'm sorry I missed that dependency.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

> 
> Fixes: f7b42442c4ac ("drm/log: Introduce a new boot logger to draw the kmsg on the screen")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   drivers/gpu/drm/clients/Kconfig | 1 +
>   lib/fonts/Kconfig               | 2 +-
>   2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/clients/Kconfig b/drivers/gpu/drm/clients/Kconfig
> index c18decc90200..7b81fd0f4cae 100644
> --- a/drivers/gpu/drm/clients/Kconfig
> +++ b/drivers/gpu/drm/clients/Kconfig
> @@ -77,6 +77,7 @@ config DRM_CLIENT_LOG
>   	select DRM_CLIENT
>   	select DRM_CLIENT_SETUP
>   	select DRM_DRAW
> +	select FONT_SUPPORT
>   	help
>   	  This enable a drm logger, that will print the kernel messages to the
>   	  screen until the userspace is ready to take over.
> diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
> index 3ac26bdbc3ff..ae59b5b4e225 100644
> --- a/lib/fonts/Kconfig
> +++ b/lib/fonts/Kconfig
> @@ -10,7 +10,7 @@ if FONT_SUPPORT
>   
>   config FONTS
>   	bool "Select compiled-in fonts"
> -	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE || DRM_PANIC
> +	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE || DRM_PANIC || DRM_CLIENT_LOG
>   	help
>   	  Say Y here if you would like to use fonts other than the default
>   	  your frame buffer console usually use.

Re: [PATCH] drm/log: select CONFIG_FONT_SUPPORT

Posted by Jocelyn Falempe 1 year ago

On 12/12/2024 17:37, Jocelyn Falempe wrote:
> On 12/12/2024 16:39, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> Without fonts, this fails to link:
>>
>> drivers/gpu/drm/clients/drm_log.o: in function `drm_log_init_client':
>> drm_log.c:(.text+0x3d4): undefined reference to `get_default_font'
>>
>> Select this, like the other users do.
> 
> Thanks for the fix, I'm sorry I missed that dependency.
> 
> Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>

I just pushed it to drm-misc-next, as it can break the build.

Best regards,

-- 

Jocelyn

> 
>>
>> Fixes: f7b42442c4ac ("drm/log: Introduce a new boot logger to draw the 
>> kmsg on the screen")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>>   drivers/gpu/drm/clients/Kconfig | 1 +
>>   lib/fonts/Kconfig               | 2 +-
>>   2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/clients/Kconfig b/drivers/gpu/drm/ 
>> clients/Kconfig
>> index c18decc90200..7b81fd0f4cae 100644
>> --- a/drivers/gpu/drm/clients/Kconfig
>> +++ b/drivers/gpu/drm/clients/Kconfig
>> @@ -77,6 +77,7 @@ config DRM_CLIENT_LOG
>>       select DRM_CLIENT
>>       select DRM_CLIENT_SETUP
>>       select DRM_DRAW
>> +    select FONT_SUPPORT
>>       help
>>         This enable a drm logger, that will print the kernel messages 
>> to the
>>         screen until the userspace is ready to take over.
>> diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
>> index 3ac26bdbc3ff..ae59b5b4e225 100644
>> --- a/lib/fonts/Kconfig
>> +++ b/lib/fonts/Kconfig
>> @@ -10,7 +10,7 @@ if FONT_SUPPORT
>>   config FONTS
>>       bool "Select compiled-in fonts"
>> -    depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE || DRM_PANIC
>> +    depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE || DRM_PANIC || 
>> DRM_CLIENT_LOG
>>       help
>>         Say Y here if you would like to use fonts other than the default
>>         your frame buffer console usually use.
>