Skip to content

Commit

Permalink
media: vivid: fix FB dependency
Browse files Browse the repository at this point in the history
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: 20889dd ("media: vivid: Introduce VIDEO_VIVID_OSD")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Arnd Bergmann authored and Hans Verkuil committed Apr 7, 2025
1 parent 0af2f6b commit 549d899
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/media/test-drivers/vivid/Kconfig
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 549d899

Please sign in to comment.