Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0399b696 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

media: venus: fix compile-test build on non-qcom ARM platform 



If QCOM_MDT_LOADER is enabled, but ARCH_QCOM is not, we run into
a build error:

ERROR: "qcom_mdt_load" [drivers/media/platform/qcom/venus/venus-core.ko] undefined!
ERROR: "qcom_mdt_get_size" [drivers/media/platform/qcom/venus/venus-core.ko] undefined!

This changes the 'select' statement again, so we only try to enable
those symbols when the drivers will actually get built, and explicitly
test for QCOM_MDT_LOADER to be enabled before calling into it.

Fixes: 76724b30 ("[media] media: venus: enable building with COMPILE_TEST")

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 06e49246

drivers/media/platform/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -476,8 +476,8 @@ config VIDEO_QCOM_VENUS 
	tristate "Qualcomm Venus V4L2 encoder/decoder driver"

	depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA

	depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST

	select QCOM_MDT_LOADER if (ARM || ARM64)

	select QCOM_SCM if (ARM || ARM64)

	select QCOM_MDT_LOADER if ARCH_QCOM

	select QCOM_SCM if ARCH_QCOM

	select VIDEOBUF2_DMA_SG

	select V4L2_MEM2MEM_DEV

	---help---

drivers/media/platform/qcom/venus/firmware.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ int venus_boot(struct device *parent, struct device *fw_dev, const char *fwname) 
	void *mem_va;

	int ret;



	if (!qcom_scm_is_available())

	if (!IS_ENABLED(CONFIG_QCOM_MDT_LOADER) || !qcom_scm_is_available())

		return -EPROBE_DEFER;



	fw_dev->parent = parent;