drm: xlnx: zynqmp_dpsub: fix Kconfig dependencies for ASoC
authorArnd Bergmann <arnd@arndb.de>
Thu, 27 Feb 2025 13:20:32 +0000 (14:20 +0100)
committerTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Wed, 12 Mar 2025 14:38:11 +0000 (16:38 +0200)
The new audio code fails to build when sounds support is in a loadable
module but the GPU driver is built-in:

x86_64-linux-ld: zynqmp_dp_audio.c:(.text+0x6a8): undefined reference to `devm_snd_soc_register_card'
x86_64-linux-ld: drivers/gpu/drm/xlnx/zynqmp_dp_audio.o:(.rodata+0x1bc): undefined reference to `snd_soc_info_volsw'
x86_64-linux-ld: drivers/gpu/drm/xlnx/zynqmp_dp_audio.o:(.rodata+0x1f0): undefined reference to `snd_soc_get_volsw'
x86_64-linux-ld: drivers/gpu/drm/xlnx/zynqmp_dp_audio.o:(.rodata+0x1f4): undefined reference to `snd_soc_put_volsw'

Change the Kconfig dependency to disallow the sound support in this
configuration.

Fixes: 3ec5c1579305 ("drm: xlnx: zynqmp_dpsub: Add DP audio support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250227132036.1136600-1-arnd@kernel.org
drivers/gpu/drm/xlnx/Kconfig

index dbecca9bdd544f1fa091081abe9550076d3b416f..cfabf5e2a0bb0a614396e08a9a233e99b904a74d 100644 (file)
@@ -22,6 +22,7 @@ config DRM_ZYNQMP_DPSUB_AUDIO
        bool "ZynqMP DisplayPort Audio Support"
        depends on DRM_ZYNQMP_DPSUB
        depends on SND && SND_SOC
+       depends on SND_SOC=y || DRM_ZYNQMP_DPSUB=m
        select SND_SOC_GENERIC_DMAENGINE_PCM
        help
          Choose this option to enable DisplayPort audio support in the ZynqMP