media: mtk-vcodec: add remoteproc dependency
PATCH 1/1 media: mtk-vcodec: add remoteproc dependency
From: Arnd Bergmann <[email protected]>
The SCP firmware can only be built if CONFIG_REMOTEPROC is enabled:
WARNING: unmet direct dependencies detected for MTK_SCP
Depends on [n]: REMOTEPROC [=n] && (ARCH_MEDIATEK [=y] || COMPILE_TEST [=y])
Selected by [y]:
- VIDEO_MEDIATEK_VCODEC [=y] && MEDIA_SUPPORT [=y] && MEDIA_PLATFORM_SUPPORT [=y] && V4L_MEM2MEM_DRIVERS [=y] && (MTK_IOMMU [=y] || COMPILE_TEST [=y]) && VIDEO_DEV [=y] && VIDEO_V4L2 [=y] && (ARCH_MEDIATEK [=y] || COMPILE_TEST [=y])
Add this as a dependency for mtk-vcodec.
--- drivers/media/platform/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/Kconfig +1 -0
@@ -276,6 +276,7 @@ config VIDEO_MEDIATEK_VCODEC # our dependencies, to avoid missing symbols during link. depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU depends on MTK_SCP || !MTK_SCP + depends on REMOTEPROC select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU
Signature · 1 line
2.27.0
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The SCP firmware can only be built if
CONFIG_REMOTEPROCis enabled:WARNING: unmet direct dependencies detected for
MTK_SCP
Depends on [n]: REMOTEPROC [=n] && (ARCH_MEDIATEK[=y] ||COMPILE_TEST[=y])
Selected by [y]:
-VIDEO_MEDIATEK_VCODEC[=y] &&MEDIA_SUPPORT[=y] &&MEDIA_PLATFORM_SUPPORT[=y] &&V4L_MEM2MEM_DRIVERS[=y] && (MTK_IOMMU[=y] ||COMPILE_TEST[=y]) &&VIDEO_DEV[=y] &&VIDEO_V4L2[=y] && (ARCH_MEDIATEK[=y] ||COMPILE_TEST[=y])
Despite setting these same options I cannot reproduce this warning on a merge of master + media. Which tree are you using?
Quoted 24 lines
Add this as a dependency for mtk-vcodec.
Fixes c7244811b1c9 ("media: mtk-vcodec: add SCP firmware ops")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/media/platform/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/media/platform/Kconfig +1
-1@@ -276,6 +276,7 @@ config VIDEO_MEDIATEK_VCODEC # our dependencies, to avoid missing symbols during link. depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU depends on MTK_SCP || !MTK_SCP + depends on REMOTEPROC select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU --2.27.0
Quoted 8 lines · Alexandre Courbot
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The SCP firmware can only be built if
CONFIG_REMOTEPROCis enabled:
Quoted 7 lines
Quoted 4 lines
WARNING: unmet direct dependencies detected for
MTK_SCP
Depends on [n]: REMOTEPROC [=n] && (ARCH_MEDIATEK[=y] ||COMPILE_TEST[=y])
Selected by [y]:
-VIDEO_MEDIATEK_VCODEC[=y] &&MEDIA_SUPPORT[=y] &&MEDIA_PLATFORM_SUPPORT[=y] &&V4L_MEM2MEM_DRIVERS[=y] && (MTK_IOMMU[=y] ||COMPILE_TEST[=y]) &&VIDEO_DEV[=y] &&VIDEO_V4L2[=y] && (ARCH_MEDIATEK[=y] ||COMPILE_TEST[=y])Despite setting these same options I cannot reproduce this warning on a merge of master + media. Which tree are you using?
Sorry about the noise. I was testing this on earlier this week on v5.10-rc5, but your commit 2da185d6fe96 ("media: mtk-vcodec: fix build breakage when one of VPU or SCP is enabled") has made it into mainline in the meantime and fixed the issue.
I had rebased my patches onto linux-next before sending them out to make sure everything still works, but did not check that it was still broken without it. Clearly my patch must have conflicted with yours during the rebase, which should have told me to recheck.
Please disregard my fix.
Arnd