media: mtk-vcodec: add remoteproc dependency

  From: Arnd Bergmann <arnd@arndb.de>

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.

Fixes: c7244811b1c9 ("media: mtk-vcodec: add SCP firmware ops")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/media/platform/Kconfig | 1 +
 1 file changed, 1 insertion(+)
  

On Fri, Dec 4, 2020 at 8:15 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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])

Despite setting these same options I cannot reproduce this warning on
a merge of master + media. Which tree are you using?

>
> Add this as a dependency for mtk-vcodec.
>
> Fixes: c7244811b1c9 ("media: mtk-vcodec: add SCP firmware ops")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/media/platform/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index ffffef2267f4..295f74c3c04b 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -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
>
  

On Fri, Dec 4, 2020 at 9:26 AM Alexandre Courbot <acourbot@chromium.org> wrote:
>
> On Fri, Dec 4, 2020 at 8:15 AM Arnd Bergmann <arnd@kernel.org> wrote:
> >
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > 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])
>
> 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