Skip to contentSkip to conversation

media: venus: fix QCOM_MDT_LOADER dependency

PATCH In review Arnd Bergmann 3 participants 3 messages Feb 16 – Mar 2

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: venus: fix QCOM_MDT_LOADER dependency

From: Arnd Bergmann <[email protected]>

When build-testined with CONFIG_QCOM_MDT_LOADER=m and VIDEO_QCOM_VENUS=y, the kernel fails to link:

x86_64-linux-ld: drivers/media/platform/qcom/venus/firmware.o: in function `venus_boot':
firmware.c:(.text+0x1e3): undefined reference to qcom_mdt_get_size' firmware.c:(.text+0x25a): undefined reference to qcom_mdt_load' firmware.c:(.text+0x272): undefined reference to `qcom_mdt_load_no_init'

The problem is the conditional 'select' statement. Change this to make the driver built-in here regardless of CONFIG_ARCH_QCOM, same as for the similar IRIS driver.

---
See https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
for the corresponding iris patch I sent earlier

---
 drivers/media/platform/qcom/venus/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/venus/Kconfig +1 -1
index 164491c5c374..075e08eaceda 100644
@@ -6,7 +6,7 @@ config VIDEO_QCOM_VENUS
 	depends on ZONE_DMA
 	select DMA_MASK_31 # technically 0xdfffffff
 	select OF_DYNAMIC if ARCH_QCOM
-	select QCOM_MDT_LOADER if ARCH_QCOM
+	select QCOM_MDT_LOADER
 	select QCOM_SCM
 	select VIDEOBUF2_DMA_CONTIG
 	select V4L2_MEM2MEM_DEV
Signature · 1 line
2.39.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When build-testined with CONFIG_QCOM_MDT_LOADER=m and VIDEO_QCOM_VENUS=y, the kernel fails to link:

x86_64-linux-ld: drivers/media/platform/qcom/venus/firmware.o: in function `venus_boot':
firmware.c:(.text+0x1e3): undefined reference to qcom_mdt_get_size' firmware.c:(.text+0x25a): undefined reference to qcom_mdt_load' firmware.c:(.text+0x272): undefined reference to `qcom_mdt_load_no_init'

Quoted 6 lines

The problem is the conditional 'select' statement. Change this to make the driver built-in here regardless of CONFIG_ARCH_QCOM, same as for the similar IRIS driver.

---

Konrad

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 27 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When build-testined with CONFIG_QCOM_MDT_LOADER=m and VIDEO_QCOM_VENUS=y, the kernel fails to link:

x86_64-linux-ld: drivers/media/platform/qcom/venus/firmware.o: in function `venus_boot':
firmware.c:(.text+0x1e3): undefined reference to qcom_mdt_get_size' firmware.c:(.text+0x25a): undefined reference to qcom_mdt_load' firmware.c:(.text+0x272): undefined reference to `qcom_mdt_load_no_init'

The problem is the conditional 'select' statement. Change this to make the driver built-in here regardless of CONFIG_ARCH_QCOM, same as for the similar IRIS driver.

---
See https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
for the corresponding iris patch I sent earlier

---
 drivers/media/platform/qcom/venus/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/venus/Kconfig +0 -0
index 164491c5c374..075e08eaceda 100644

drivers/media/platform/qcom/venus/Kconfig config VIDEO_QCOM_VENUS · line 12

Quoted 8 lines
drivers/media/platform/qcom/venus/Kconfig +1 -1
@@ -6,7 +6,7 @@ config VIDEO_QCOM_VENUS
 	depends on ZONE_DMA
 	select DMA_MASK_31 # technically 0xdfffffff
 	select OF_DYNAMIC if ARCH_QCOM
-	select QCOM_MDT_LOADER if ARCH_QCOM
+	select QCOM_MDT_LOADER
 	select QCOM_SCM
 	select VIDEOBUF2_DMA_CONTIG
 	select V4L2_MEM2MEM_DEV

Thanks,
Dikshita