| Message ID | 2918377.0irYYn09PU@wuerfel (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 19, 2015 at 02:53:26PM +0200, Arnd Bergmann wrote: > The recently added iommu code in the nouveau driver fails to build > when the IOMMU support is disabled: > > drivers/gpu/drm/nouveau/nouveau_platform.c: In function 'nouveau_platform_probe_iommu': > drivers/gpu/drm/nouveau/nouveau_platform.c:113:41: error: 'const struct iommu_ops' has no mem > > To avoid the build error, this now adds an explicit dependency on the > IOMMU implementation. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: 58fd9375c2c5 ("drm/nouveau/platform: probe IOMMU if present") Acked-by: Thierry Reding <treding@nvidia.com>
On 05/19/2015 09:53 PM, Arnd Bergmann wrote: > The recently added iommu code in the nouveau driver fails to build > when the IOMMU support is disabled: > > drivers/gpu/drm/nouveau/nouveau_platform.c: In function 'nouveau_platform_probe_iommu': > drivers/gpu/drm/nouveau/nouveau_platform.c:113:41: error: 'const struct iommu_ops' has no mem > > To avoid the build error, this now adds an explicit dependency on the > IOMMU implementation. I have a local patch to nouveau_platform.c that only calls the IOMMU functions if CONFIG_IOMMU is set. Wouldn't this be more suitable as IOMMU support is only used by Tegra and thus not beneficial for desktop GPUs?
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index 5ab13e7939db..18dfa4af60ea 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -28,6 +28,7 @@ config DRM_NOUVEAU config NOUVEAU_PLATFORM_DRIVER bool "Nouveau (NVIDIA) SoC GPUs" depends on DRM_NOUVEAU && ARCH_TEGRA + depends on IOMMU default y help Support for Nouveau platform driver, used for SoC GPUs as found
The recently added iommu code in the nouveau driver fails to build when the IOMMU support is disabled: drivers/gpu/drm/nouveau/nouveau_platform.c: In function 'nouveau_platform_probe_iommu': drivers/gpu/drm/nouveau/nouveau_platform.c:113:41: error: 'const struct iommu_ops' has no mem To avoid the build error, this now adds an explicit dependency on the IOMMU implementation. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 58fd9375c2c5 ("drm/nouveau/platform: probe IOMMU if present")