| Message ID | edbd6c95873c51853c4f645ee1ed81a3522a5864.1660657745.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: qcom: Clean up Kconfig dependencies | expand |
Hi Robin, On Tue, 16 Aug 2022 at 15:49, Robin Murphy <robin.murphy@arm.com> wrote: > > Depending on IOMMU_DMA is suspicious, since the low-level DMA ops > internals and MSI helpers is provides are not of interest to general > drivers. In practice it mostly seems to be serving as a dependency on > ARM64 here, so do that properly. The venus driver looks like it won't > actually be useful at runtime without the IOMMU API, so add that too. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > drivers/media/platform/qcom/camss/Kconfig | 2 +- > drivers/media/platform/qcom/venus/Kconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/qcom/camss/Kconfig b/drivers/media/platform/qcom/camss/Kconfig > index 4eda48cb1adf..575f42377c12 100644 > --- a/drivers/media/platform/qcom/camss/Kconfig > +++ b/drivers/media/platform/qcom/camss/Kconfig > @@ -2,7 +2,7 @@ config VIDEO_QCOM_CAMSS > tristate "Qualcomm V4L2 Camera Subsystem driver" > depends on V4L_PLATFORM_DRIVERS > depends on VIDEO_DEV > - depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST > + depends on (ARCH_QCOM && ARM64) || COMPILE_TEST > select MEDIA_CONTROLLER > select VIDEO_V4L2_SUBDEV_API > select VIDEOBUF2_DMA_SG > diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/platform/qcom/venus/Kconfig > index bfd50e8f3421..f04b45720bca 100644 > --- a/drivers/media/platform/qcom/venus/Kconfig > +++ b/drivers/media/platform/qcom/venus/Kconfig > @@ -2,7 +2,7 @@ config VIDEO_QCOM_VENUS > tristate "Qualcomm Venus V4L2 encoder/decoder driver" > depends on V4L_MEM2MEM_DRIVERS > depends on VIDEO_DEV && QCOM_SMEM > - depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST > + depends on (ARCH_QCOM && ARM64 && IOMMU_API) || COMPILE_TEST > select QCOM_MDT_LOADER if ARCH_QCOM > select QCOM_SCM > select VIDEOBUF2_DMA_CONTIG > -- > 2.36.1.dirty > Both parts look good to me and build just fine. Reviewed-by: Robert Foss <robert.foss@linaro.org>
diff --git a/drivers/media/platform/qcom/camss/Kconfig b/drivers/media/platform/qcom/camss/Kconfig index 4eda48cb1adf..575f42377c12 100644 --- a/drivers/media/platform/qcom/camss/Kconfig +++ b/drivers/media/platform/qcom/camss/Kconfig @@ -2,7 +2,7 @@ config VIDEO_QCOM_CAMSS tristate "Qualcomm V4L2 Camera Subsystem driver" depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV - depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST + depends on (ARCH_QCOM && ARM64) || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEOBUF2_DMA_SG diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/platform/qcom/venus/Kconfig index bfd50e8f3421..f04b45720bca 100644 --- a/drivers/media/platform/qcom/venus/Kconfig +++ b/drivers/media/platform/qcom/venus/Kconfig @@ -2,7 +2,7 @@ config VIDEO_QCOM_VENUS tristate "Qualcomm Venus V4L2 encoder/decoder driver" depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && QCOM_SMEM - depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST + depends on (ARCH_QCOM && ARM64 && IOMMU_API) || COMPILE_TEST select QCOM_MDT_LOADER if ARCH_QCOM select QCOM_SCM select VIDEOBUF2_DMA_CONTIG
Depending on IOMMU_DMA is suspicious, since the low-level DMA ops internals and MSI helpers is provides are not of interest to general drivers. In practice it mostly seems to be serving as a dependency on ARM64 here, so do that properly. The venus driver looks like it won't actually be useful at runtime without the IOMMU API, so add that too. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/media/platform/qcom/camss/Kconfig | 2 +- drivers/media/platform/qcom/venus/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)