[PATCH -next] media: stm32-dma2d: fix Kconfig dependencies grouping

From: Randy Dunlap
Date: Tue Nov 02 2021 - 11:41:00 EST


On x86_64, when
CONFIG_COMPILE_TEST=y
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_STM32_DMA2D=y

there are many build errors (this is only a sampling of them):

ld: drivers/media/common/videobuf2/videobuf2-core.o: in function `vb2_core_streamon':
videobuf2-core.c:(.text+0x1f4e): undefined reference to `v4l_vb2q_enable_media_source'
ld: drivers/media/platform/stm32/dma2d/dma2d.o: in function `dma2d_remove':
dma2d.c:(.text+0x4d9): undefined reference to `v4l2_m2m_release'
ld: dma2d.c:(.text+0x4e5): undefined reference to `video_unregister_device'
ld: dma2d.c:(.text+0x4ed): undefined reference to `v4l2_device_unregister'
ld: drivers/media/platform/stm32/dma2d/dma2d.o: in function `device_run':
dma2d.c:(.text+0x588): undefined reference to `v4l2_m2m_next_buf'
ld: dma2d.c:(.text+0x59b): undefined reference to `v4l2_m2m_next_buf'
ld: dma2d.c:(.text+0x61f): undefined reference to `v4l2_m2m_buf_copy_metadata'
ld: drivers/media/platform/stm32/dma2d/dma2d.o: in function `vidioc_g_fmt':
dma2d.c:(.text+0x71c): undefined reference to `v4l2_m2m_get_vq'
ld: drivers/media/platform/stm32/dma2d/dma2d.o: in function `dma2d_release':
dma2d.c:(.text+0x850): undefined reference to `video_devdata'
ld: dma2d.c:(.text+0x87b): undefined reference to `v4l2_m2m_ctx_release'
ld: dma2d.c:(.text+0x88f): undefined reference to `v4l2_ctrl_handler_free'
ld: dma2d.c:(.text+0x897): undefined reference to `v4l2_fh_del'
ld: dma2d.c:(.text+0x89f): undefined reference to `v4l2_fh_exit'
ld: drivers/media/platform/stm32/dma2d/dma2d.o: in function `dma2d_buf_queue':
dma2d.c:(.text+0x8db): undefined reference to `v4l2_m2m_buf_queue'
ld: drivers/media/platform/stm32/dma2d/dma2d.o: in function `dma2d_stop_streaming':
dma2d.c:(.text+0x922): undefined reference to `v4l2_m2m_buf_remove'
ld: dma2d.c:(.text+0x956): undefined reference to `v4l2_m2m_buf_remove'
ld: drivers/media/platform/stm32/dma2d/dma2d.o: in function `dma2d_open':
dma2d.c:(.text+0x996): undefined reference to `video_devdata'

Regrouping the depend items limits the STM32_DMA2D symbol to =m,
so that the build errors are eliminated.

Fixes: bdbbd511ef0c ("media: stm32-dma2d: STM32 DMA2D driver")
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: Hugues Fruchet <hugues.fruchet@xxxxxxxxxxx>
Cc: linux-media@xxxxxxxxxxxxxxx
Cc: Dillon Min <dillon.minfei@xxxxxxxxx>
Cc: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
---
drivers/media/platform/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20211102.orig/drivers/media/platform/Kconfig
+++ linux-next-20211102/drivers/media/platform/Kconfig
@@ -494,7 +494,7 @@ endif # VIDEO_STI_DELTA

config VIDEO_STM32_DMA2D
tristate "STM32 Chrom-Art Accelerator (DMA2D)"
- depends on (VIDEO_DEV && VIDEO_V4L2 && ARCH_STM32) || COMPILE_TEST
+ depends on (VIDEO_DEV && VIDEO_V4L2) && (ARCH_STM32 || COMPILE_TEST)
select VIDEOBUF2_DMA_CONTIG
select V4L2_MEM2MEM_DEV
help