[PATCH] drm/tegra: vic: fix implicit function declaration warning

From: Anders Roxell
Date: Mon Feb 18 2019 - 06:00:57 EST


When CONFIG_IOMMU_API isn't set the following warnings pops up:

drivers/gpu/drm/tegra/vic.c: In function âvic_bootâ:
drivers/gpu/drm/tegra/vic.c:110:31: error: implicit declaration of function âdev_iommu_fwspec_getâ; did you mean âiommu_fwspec_freeâ? [-Werror=implicit-function-declaration]
struct iommu_fwspec *spec = dev_iommu_fwspec_get(vic->dev);
^~~~~~~~~~~~~~~~~~~~
iommu_fwspec_free
drivers/gpu/drm/tegra/vic.c:110:31: warning: initialization of âstruct iommu_fwspec *â from âintâ makes pointer from integer without a cast [-Wint-conversion]
drivers/gpu/drm/tegra/vic.c:117:19: error: âstruct iommu_fwspecâ has no member named ânum_idsâ
if (spec && spec->num_ids > 0) {
^~
drivers/gpu/drm/tegra/vic.c:118:16: error: âstruct iommu_fwspecâ has no member named âidsâ
value = spec->ids[0] & 0xffff;
^~

Rework so that its inside a '#ifdef CONFIG_IOMMU_API' block.

Fixes: f3779cb190a5 ("drm/tegra: vic: Support stream ID register programming")
Signed-off-by: Anders Roxell <anders.roxell@xxxxxxxxxx>
---
drivers/gpu/drm/tegra/vic.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c
index 39bfed9623de..982ce37ecde1 100644
--- a/drivers/gpu/drm/tegra/vic.c
+++ b/drivers/gpu/drm/tegra/vic.c
@@ -106,6 +106,7 @@ static int vic_boot(struct vic *vic)
if (vic->booted)
return 0;

+#ifdef CONFIG_IOMMU_API
if (vic->config->supports_sid) {
struct iommu_fwspec *spec = dev_iommu_fwspec_get(vic->dev);
u32 value;
@@ -121,6 +122,7 @@ static int vic_boot(struct vic *vic)
vic_writel(vic, value, VIC_THI_STREAMID1);
}
}
+#endif

/* setup clockgating registers */
vic_writel(vic, CG_IDLE_CG_DLY_CNT(4) |
--
2.19.2