[PATCH] media: platform: amd: add DRM_AMDGPU dependency

Arnd Bergmann posted 1 patch 4 weeks, 1 day ago
drivers/media/platform/amd/isp4/Kconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[PATCH] media: platform: amd: add DRM_AMDGPU dependency
Posted by Arnd Bergmann 4 weeks, 1 day ago
From: Arnd Bergmann <arnd@arndb.de>

With DRM_AMDGPU=m and DRM_AMD_ISP=y, it is possible to configura
VIDEO_AMD_ISP4_CAPTURE as built-in, but that fails to link:

aarch64-linux-ld: drivers/media/platform/amd/isp4/isp4_interface.o: in function `isp4if_gpu_mem_alloc.isra.0':
isp4_interface.c:(.text+0x1d0): undefined reference to `isp_kernel_buffer_alloc'
aarch64-linux-ld: drivers/media/platform/amd/isp4/isp4_interface.o: in function `isp4if_dealloc_fw_gpumem':
isp4_interface.c:(.text+0x26c): undefined reference to `isp_kernel_buffer_free'

Add a dependency on the tristate DRM_AMDGPU symbol in addition to
the boolean DRM_AMD_ISP=y, so this can only be built-in if
the ISP driver is also linked into the kernel itself.

Fixes: 9a54c285630c ("media: platform: amd: Introduce amd isp4 capture driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/media/platform/amd/isp4/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/amd/isp4/Kconfig b/drivers/media/platform/amd/isp4/Kconfig
index 55dd2dc453a2..9d1927af1cb8 100644
--- a/drivers/media/platform/amd/isp4/Kconfig
+++ b/drivers/media/platform/amd/isp4/Kconfig
@@ -2,7 +2,9 @@
 
 config VIDEO_AMD_ISP4_CAPTURE
 	tristate "AMD ISP4 and camera driver"
-	depends on DRM_AMD_ISP && VIDEO_DEV && HAS_DMA
+	depends on DRM_AMDGPU && DRM_AMD_ISP
+	depends on HAS_DMA
+	depends on VIDEO_DEV
 	select VIDEOBUF2_CORE
 	select VIDEOBUF2_MEMOPS
 	select VIDEOBUF2_V4L2
-- 
2.39.5
Re: [PATCH] media: platform: amd: add DRM_AMDGPU dependency
Posted by Bin Du 4 weeks, 1 day ago
Hi Arnd,

Thanks for the fix.

On 5/15/2026 5:12 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> With DRM_AMDGPU=m and DRM_AMD_ISP=y, it is possible to configura
> VIDEO_AMD_ISP4_CAPTURE as built-in, but that fails to link:
> 
> aarch64-linux-ld: drivers/media/platform/amd/isp4/isp4_interface.o: in function `isp4if_gpu_mem_alloc.isra.0':
> isp4_interface.c:(.text+0x1d0): undefined reference to `isp_kernel_buffer_alloc'
> aarch64-linux-ld: drivers/media/platform/amd/isp4/isp4_interface.o: in function `isp4if_dealloc_fw_gpumem':
> isp4_interface.c:(.text+0x26c): undefined reference to `isp_kernel_buffer_free'
> 

I verified this. Reproducing the link failure on the unpatched tree
also requires CONFIG_MEDIA_SUPPORT=y and CONFIG_VIDEO_DEV=y; otherwise
Kconfig downgrades CONFIG_VIDEO_AMD_ISP4_CAPTURE to m.

> Add a dependency on the tristate DRM_AMDGPU symbol in addition to
> the boolean DRM_AMD_ISP=y, so this can only be built-in if
> the ISP driver is also linked into the kernel itself.
> 
> Fixes: 9a54c285630c ("media: platform: amd: Introduce amd isp4 capture driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/media/platform/amd/isp4/Kconfig | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/amd/isp4/Kconfig b/drivers/media/platform/amd/isp4/Kconfig
> index 55dd2dc453a2..9d1927af1cb8 100644
> --- a/drivers/media/platform/amd/isp4/Kconfig
> +++ b/drivers/media/platform/amd/isp4/Kconfig
> @@ -2,7 +2,9 @@
>  
>  config VIDEO_AMD_ISP4_CAPTURE
>  	tristate "AMD ISP4 and camera driver"
> -	depends on DRM_AMD_ISP && VIDEO_DEV && HAS_DMA
> +	depends on DRM_AMDGPU && DRM_AMD_ISP
> +	depends on HAS_DMA
> +	depends on VIDEO_DEV
>  	select VIDEOBUF2_CORE
>  	select VIDEOBUF2_MEMOPS
>  	select VIDEOBUF2_V4L2

With this patch applied, olddefconfig correctly changes
CONFIG_VIDEO_AMD_ISP4_CAPTURE to m when CONFIG_DRM_AMDGPU=m, avoiding
the link failure.

Reviewed-by: Bin Du <Bin.Du@amd.com>
Tested-by: Bin Du <Bin.Du@amd.com>