diff mbox series

media: vivid: fix FB dependency

Message ID 20250314213859.3543936-1-arnd@kernel.org (mailing list archive)
State New
Headers show
Series media: vivid: fix FB dependency | expand

Commit Message

Arnd Bergmann March 14, 2025, 9:38 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

It's not enough to have a dependency on CONFIG_FB, as that can be in
a loadable module when vivid itself is builtin:

drivers/media/test-drivers/vivid/vivid-osd.o: in function `vivid_fb_init':
vivid-osd.c:(.text+0xdc0): undefined reference to `fb_alloc_cmap'
vivid-osd.c:(.text+0xe26): undefined reference to `register_framebuffer'

Change the dependency to only allow configurations that can be built,
but change the FB to FB_CORE so this is also possible when using
DRM with FB compatibility rather than full fbdev.

Fixes: 20889ddede38 ("media: vivid: Introduce VIDEO_VIVID_OSD")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/media/test-drivers/vivid/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Ricardo Ribalda March 17, 2025, 12:08 p.m. UTC | #1 
Thanks for the patch!

Just out of curiosity, how did you found this? make randconfig?

Best regards!

On Fri, 14 Mar 2025 at 22:39, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> It's not enough to have a dependency on CONFIG_FB, as that can be in
> a loadable module when vivid itself is builtin:
>
> drivers/media/test-drivers/vivid/vivid-osd.o: in function `vivid_fb_init':
> vivid-osd.c:(.text+0xdc0): undefined reference to `fb_alloc_cmap'
> vivid-osd.c:(.text+0xe26): undefined reference to `register_framebuffer'
>
> Change the dependency to only allow configurations that can be built,
> but change the FB to FB_CORE so this is also possible when using
> DRM with FB compatibility rather than full fbdev.
>
> Fixes: 20889ddede38 ("media: vivid: Introduce VIDEO_VIVID_OSD")
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/media/test-drivers/vivid/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/test-drivers/vivid/Kconfig b/drivers/media/test-drivers/vivid/Kconfig
> index e95edc0f22bf..cc470070a7a5 100644
> --- a/drivers/media/test-drivers/vivid/Kconfig
> +++ b/drivers/media/test-drivers/vivid/Kconfig
> @@ -32,7 +32,8 @@ config VIDEO_VIVID_CEC
>
>  config VIDEO_VIVID_OSD
>         bool "Enable Framebuffer for testing Output Overlay"
> -       depends on VIDEO_VIVID && FB
> +       depends on VIDEO_VIVID && FB_CORE
> +       depends on VIDEO_VIVID=m || FB_CORE=y
>         default y
>         select FB_IOMEM_HELPERS
>         help
> --
> 2.39.5
>
Arnd Bergmann March 17, 2025, 12:15 p.m. UTC | #2 
On Mon, Mar 17, 2025, at 13:08, Ricardo Ribalda wrote:
> Thanks for the patch!
>
> Just out of curiosity, how did you found this? make randconfig?
>

Yes, I do a lot of randconfig builds.

     Arnd
diff mbox series

Patch

diff --git a/drivers/media/test-drivers/vivid/Kconfig b/drivers/media/test-drivers/vivid/Kconfig
index e95edc0f22bf..cc470070a7a5 100644
--- a/drivers/media/test-drivers/vivid/Kconfig
+++ b/drivers/media/test-drivers/vivid/Kconfig
@@ -32,7 +32,8 @@  config VIDEO_VIVID_CEC
 
 config VIDEO_VIVID_OSD
 	bool "Enable Framebuffer for testing Output Overlay"
-	depends on VIDEO_VIVID && FB
+	depends on VIDEO_VIVID && FB_CORE
+	depends on VIDEO_VIVID=m || FB_CORE=y
 	default y
 	select FB_IOMEM_HELPERS
 	help