drm/msm: Stop using iommu_present()

rmurphy-arm · robclark · commit e2a88eabb024 · 2022-04-11T09:36:13.000-07:00
Even if some IOMMU has registered itself on the platform "bus", that doesn't necessarily mean it provides translation for the device we care about. Replace iommu_present() with a more appropriate check. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Rob Clark <robdclark@gmail.com> Patchwork: https://patchwork.freedesktop.org/patch/480707/ Link: https://lore.kernel.org/r/5ab4f4574d7f3e042261da702d493ee40d003356.1649168268.git.robin.murphy@arm.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Rob Clark <robdclark@chromium.org>
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
@@ -274,7 +274,7 @@ bool msm_use_mmu(struct drm_device *dev)
 	struct msm_drm_private *priv = dev->dev_private;
 
 	/* a2xx comes with its own MMU */
-	return priv->is_a2xx || iommu_present(&platform_bus_type);
+	return priv->is_a2xx || device_iommu_mapped(dev->dev);
 }
 
 static int msm_init_vram(struct drm_device *dev)

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ bool msm_use_mmu(struct drm_device *dev)`
`274`	`274`	`struct msm_drm_private *priv = dev->dev_private;`
`275`	`275`
`276`	`276`	`/* a2xx comes with its own MMU */`
`277`		`- return priv->is_a2xx \|\| iommu_present(&platform_bus_type);`
	`277`	`+ return priv->is_a2xx \|\| device_iommu_mapped(dev->dev);`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`static int msm_init_vram(struct drm_device *dev)`