On Fri Mar 14 22:38:55 2025 +0100, Arnd Bergmann wrote:
> 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 <a...@arndb.de>
> Reviewed-by: Ricardo Ribalda <riba...@chromium.org>
> Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>
Patch committed.
Thanks,
Hans Verkuil
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
