gpu: host1x: select IOMMU_IOVA

Submitted by Arnd Bergmann on April 19, 2017, 6:24 p.m.

Details

Message ID 20170419182449.885312-1-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann April 19, 2017, 6:24 p.m.
When IOMMU_IOVA is not built-in but host1x is, we get a link error:

drivers/gpu/host1x/dev.o: In function `host1x_remove':
dev.c:(.text.host1x_remove+0x50): undefined reference to `put_iova_domain'
drivers/gpu/host1x/dev.o: In function `host1x_probe':
dev.c:(.text.host1x_probe+0x31c): undefined reference to `init_iova_domain'
dev.c:(.text.host1x_probe+0x38c): undefined reference to `put_iova_domain'
drivers/gpu/host1x/cdma.o: In function `host1x_cdma_init':
cdma.c:(.text.host1x_cdma_init+0x238): undefined reference to `alloc_iova'
cdma.c:(.text.host1x_cdma_init+0x2c0): undefined reference to `__free_iova'
drivers/gpu/host1x/cdma.o: In function `host1x_cdma_deinit':
cdma.c:(.text.host1x_cdma_deinit+0xb0): undefined reference to `free_iova'

This adds the same select statement that we have for drm_tegra.

Fixes: 404bfb78daf3 ("gpu: host1x: Add IOMMU support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/host1x/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Mikko Perttunen April 20, 2017, 6:47 a.m.
Ah, had to forget something :)

Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>

On 19.04.2017 21:24, Arnd Bergmann wrote:
> When IOMMU_IOVA is not built-in but host1x is, we get a link error:
>
> drivers/gpu/host1x/dev.o: In function `host1x_remove':
> dev.c:(.text.host1x_remove+0x50): undefined reference to `put_iova_domain'
> drivers/gpu/host1x/dev.o: In function `host1x_probe':
> dev.c:(.text.host1x_probe+0x31c): undefined reference to `init_iova_domain'
> dev.c:(.text.host1x_probe+0x38c): undefined reference to `put_iova_domain'
> drivers/gpu/host1x/cdma.o: In function `host1x_cdma_init':
> cdma.c:(.text.host1x_cdma_init+0x238): undefined reference to `alloc_iova'
> cdma.c:(.text.host1x_cdma_init+0x2c0): undefined reference to `__free_iova'
> drivers/gpu/host1x/cdma.o: In function `host1x_cdma_deinit':
> cdma.c:(.text.host1x_cdma_deinit+0xb0): undefined reference to `free_iova'
>
> This adds the same select statement that we have for drm_tegra.
>
> Fixes: 404bfb78daf3 ("gpu: host1x: Add IOMMU support")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/gpu/host1x/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/host1x/Kconfig b/drivers/gpu/host1x/Kconfig
> index b2fd029d67b3..91916326957f 100644
> --- a/drivers/gpu/host1x/Kconfig
> +++ b/drivers/gpu/host1x/Kconfig
> @@ -1,6 +1,7 @@
>  config TEGRA_HOST1X
>  	tristate "NVIDIA Tegra host1x driver"
>  	depends on ARCH_TEGRA || (ARM && COMPILE_TEST)
> +	select IOMMU_IOVA if IOMMU_SUPPORT
>  	help
>  	  Driver for the NVIDIA Tegra host1x hardware.
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sean Paul May 18, 2017, 3:05 p.m.
On Thu, Apr 20, 2017 at 09:47:35AM +0300, Mikko Perttunen wrote:
> Ah, had to forget something :)
> 
> Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>

Applied to -misc-fixes, thank you

Sean


> 
> On 19.04.2017 21:24, Arnd Bergmann wrote:
> > When IOMMU_IOVA is not built-in but host1x is, we get a link error:
> > 
> > drivers/gpu/host1x/dev.o: In function `host1x_remove':
> > dev.c:(.text.host1x_remove+0x50): undefined reference to `put_iova_domain'
> > drivers/gpu/host1x/dev.o: In function `host1x_probe':
> > dev.c:(.text.host1x_probe+0x31c): undefined reference to `init_iova_domain'
> > dev.c:(.text.host1x_probe+0x38c): undefined reference to `put_iova_domain'
> > drivers/gpu/host1x/cdma.o: In function `host1x_cdma_init':
> > cdma.c:(.text.host1x_cdma_init+0x238): undefined reference to `alloc_iova'
> > cdma.c:(.text.host1x_cdma_init+0x2c0): undefined reference to `__free_iova'
> > drivers/gpu/host1x/cdma.o: In function `host1x_cdma_deinit':
> > cdma.c:(.text.host1x_cdma_deinit+0xb0): undefined reference to `free_iova'
> > 
> > This adds the same select statement that we have for drm_tegra.
> > 
> > Fixes: 404bfb78daf3 ("gpu: host1x: Add IOMMU support")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> >  drivers/gpu/host1x/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/gpu/host1x/Kconfig b/drivers/gpu/host1x/Kconfig
> > index b2fd029d67b3..91916326957f 100644
> > --- a/drivers/gpu/host1x/Kconfig
> > +++ b/drivers/gpu/host1x/Kconfig
> > @@ -1,6 +1,7 @@
> >  config TEGRA_HOST1X
> >  	tristate "NVIDIA Tegra host1x driver"
> >  	depends on ARCH_TEGRA || (ARM && COMPILE_TEST)
> > +	select IOMMU_IOVA if IOMMU_SUPPORT
> >  	help
> >  	  Driver for the NVIDIA Tegra host1x hardware.
> > 
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/host1x/Kconfig b/drivers/gpu/host1x/Kconfig
index b2fd029d67b3..91916326957f 100644
--- a/drivers/gpu/host1x/Kconfig
+++ b/drivers/gpu/host1x/Kconfig
@@ -1,6 +1,7 @@ 
 config TEGRA_HOST1X
 	tristate "NVIDIA Tegra host1x driver"
 	depends on ARCH_TEGRA || (ARM && COMPILE_TEST)
+	select IOMMU_IOVA if IOMMU_SUPPORT
 	help
 	  Driver for the NVIDIA Tegra host1x hardware.