mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-28 04:17:47 +00:00
[media] davinci: add V4L2 dependencies
The davinci media drivers use videobuf2, which they enable through a 'select' statement. If one of these drivers is built-in, but the v4l2 core is a loadable modules, we end up with a link error: drivers/built-in.o: In function `vb2_fop_mmap': :(.text+0x113e84): undefined reference to `video_devdata' drivers/built-in.o: In function `vb2_ioctl_create_bufs': :(.text+0x114710): undefined reference to `video_devdata' drivers/built-in.o: In function `vb2_ioctl_reqbufs': :(.text+0x114ed8): undefined reference to `video_devdata' drivers/built-in.o: In function `vb2_ioctl_querybuf': :(.text+0x115530): undefined reference to `video_devdata' To solve this, we need to add a dependency on VIDEO_V4L2, which enforces that the davinci drivers themselves can only be loadable modules if V4L2 is not built-in, and they do not cause the videobuf2 code to be built-in. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
eb79dbf6c2
commit
24692801a4
@ -1,6 +1,6 @@
|
|||||||
config VIDEO_DAVINCI_VPIF_DISPLAY
|
config VIDEO_DAVINCI_VPIF_DISPLAY
|
||||||
tristate "TI DaVinci VPIF V4L2-Display driver"
|
tristate "TI DaVinci VPIF V4L2-Display driver"
|
||||||
depends on VIDEO_DEV
|
depends on VIDEO_V4L2
|
||||||
depends on ARCH_DAVINCI || COMPILE_TEST
|
depends on ARCH_DAVINCI || COMPILE_TEST
|
||||||
depends on HAS_DMA
|
depends on HAS_DMA
|
||||||
select VIDEOBUF2_DMA_CONTIG
|
select VIDEOBUF2_DMA_CONTIG
|
||||||
@ -16,7 +16,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY
|
|||||||
|
|
||||||
config VIDEO_DAVINCI_VPIF_CAPTURE
|
config VIDEO_DAVINCI_VPIF_CAPTURE
|
||||||
tristate "TI DaVinci VPIF video capture driver"
|
tristate "TI DaVinci VPIF video capture driver"
|
||||||
depends on VIDEO_DEV
|
depends on VIDEO_V4L2
|
||||||
depends on ARCH_DAVINCI || COMPILE_TEST
|
depends on ARCH_DAVINCI || COMPILE_TEST
|
||||||
depends on HAS_DMA
|
depends on HAS_DMA
|
||||||
select VIDEOBUF2_DMA_CONTIG
|
select VIDEOBUF2_DMA_CONTIG
|
||||||
@ -75,7 +75,7 @@ config VIDEO_DM365_ISIF
|
|||||||
|
|
||||||
config VIDEO_DAVINCI_VPBE_DISPLAY
|
config VIDEO_DAVINCI_VPBE_DISPLAY
|
||||||
tristate "TI DaVinci VPBE V4L2-Display driver"
|
tristate "TI DaVinci VPBE V4L2-Display driver"
|
||||||
depends on ARCH_DAVINCI
|
depends on VIDEO_V4L2 && ARCH_DAVINCI
|
||||||
depends on HAS_DMA
|
depends on HAS_DMA
|
||||||
select VIDEOBUF2_DMA_CONTIG
|
select VIDEOBUF2_DMA_CONTIG
|
||||||
help
|
help
|
||||||
|
Loading…
Reference in New Issue
Block a user