]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/nouveau: fix build error without CONFIG_IOMMU_API
authorChen Zhou <chenzhou10@huawei.com>
Thu, 16 Jan 2020 12:50:10 +0000 (20:50 +0800)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 22 Jan 2020 22:56:51 +0000 (08:56 +1000)
If CONFIG_IOMMU_API is n, build fails:

vers/gpu/drm/nouveau/nvkm/subdev/ltc/gp10b.c:37:9: error: implicit declaration of function dev_iommu_fwspec_get; did you mean iommu_fwspec_free? [-Werror=implicit-function-declaration]
  spec = dev_iommu_fwspec_get(device->dev);
         ^~~~~~~~~~~~~~~~~~~~
         iommu_fwspec_free
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp10b.c:37:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  spec = dev_iommu_fwspec_get(device->dev);
       ^
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp10b.c:39:17: error: struct iommu_fwspec has no member named ids
   u32 sid = spec->ids[0] & 0xffff;

Seletc IOMMU_API under config DRM_NOUVEAU to fix this.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/Kconfig

index 9c990266e8768674dc18c8fdf0bd0343265a9044..ce03693698ef97b5bee7ffd29fec7c51196664b2 100644 (file)
@@ -2,6 +2,7 @@
 config DRM_NOUVEAU
        tristate "Nouveau (NVIDIA) cards"
        depends on DRM && PCI && MMU
+       select IOMMU_API
        select FW_LOADER
        select DRM_KMS_HELPER
        select DRM_TTM