Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1675875 > unrolled thread

[PATCH 3/3] [media] venus: fix compile-test build on non-qcom ARM platform

Started byArnd Bergmann <arnd@arndb.de>
First post2017-06-27 17:10 +0200
Last post2017-06-28 22:30 +0200
Articles 3 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  [PATCH 3/3] [media] venus: fix compile-test build on non-qcom ARM platform Arnd Bergmann <arnd@arndb.de> - 2017-06-27 17:10 +0200
    Re: [PATCH 3/3] [media] venus: fix compile-test build on non-qcom ARM  platform Stanimir Varbanov <stanimir.varbanov@linaro.org> - 2017-06-27 21:50 +0200
      Re: [PATCH 3/3] [media] venus: fix compile-test build on non-qcom ARM platform Arnd Bergmann <arnd@arndb.de> - 2017-06-28 22:30 +0200

#1675875 — [PATCH 3/3] [media] venus: fix compile-test build on non-qcom ARM platform

FromArnd Bergmann <arnd@arndb.de>
Date2017-06-27 17:10 +0200
Subject[PATCH 3/3] [media] venus: fix compile-test build on non-qcom ARM platform
Message-ID<tX0hP-2f9-15@gated-at.bofh.it>
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.

Fixes: 76724b30f222 ("[media] media: venus: enable building with COMPILE_TEST")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/media/platform/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index cb2f31cd0088..635c53e61f8a 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -475,8 +475,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---
-- 
2.9.0

[toc] | [next] | [standalone]


#1676110 — Re: [PATCH 3/3] [media] venus: fix compile-test build on non-qcom ARM platform

FromStanimir Varbanov <stanimir.varbanov@linaro.org>
Date2017-06-27 21:50 +0200
SubjectRe: [PATCH 3/3] [media] venus: fix compile-test build on non-qcom ARM platform
Message-ID<tX4EN-57v-7@gated-at.bofh.it>
In reply to#1675875
Hi Arnd,

On 27.06.2017 18:02, Arnd Bergmann wrote:
> 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!

Ahh, thanks for the fix, these two will also pursuing me in my dreams.

> 
> This changes the 'select' statement again, so we only try to enable
> those symbols when the drivers will actually get built.
> 
> Fixes: 76724b30f222 ("[media] media: venus: enable building with COMPILE_TEST")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>

> ---
>   drivers/media/platform/Kconfig | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index cb2f31cd0088..635c53e61f8a 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -475,8 +475,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---
> 

regards,
Stan

[toc] | [prev] | [next] | [standalone]


#1677136

FromArnd Bergmann <arnd@arndb.de>
Date2017-06-28 22:30 +0200
Message-ID<tXrL3-26y-5@gated-at.bofh.it>
In reply to#1676110
On Tue, Jun 27, 2017 at 9:45 PM, Stanimir Varbanov
<stanimir.varbanov@linaro.org> wrote:
> Hi Arnd,
>
> On 27.06.2017 18:02, Arnd Bergmann wrote:
>>
>> 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!
>
>
> Ahh, thanks for the fix, these two will also pursuing me in my dreams.

I just came after me as well, as I hit another corner case, we need this
fixup on top, I'll send a replacement:

Subject: [PATCH] fixup! [media] venus: fix compile-test  build on
non-qcom ARM platform

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/media/platform/qcom/venus/firmware.c
b/drivers/media/platform/qcom/venus/firmware.c
index 76edb9f60311..3794b9e3250b 100644
--- a/drivers/media/platform/qcom/venus/firmware.c
+++ b/drivers/media/platform/qcom/venus/firmware.c
@@ -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;

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web