Merge tag 'drm-msm-fixes-2022-04-20' of https://gitlab.freedesktop.org/drm/msm into drm-fixes

airlied · airlied · commit 70da382e1c5b · 2022-04-22T09:25:47.000+10:00
Revert to fix iommu regression. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rob Clark <robdclark@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGtvPo4xD2peAztDMPP2n4utb7d9WQboMFwsba9E8U2rCw@mail.gmail.com
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 || device_iommu_mapped(dev->dev);
+	return priv->is_a2xx || iommu_present(&platform_bus_type);
 }
 
 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 \|\| device_iommu_mapped(dev->dev);`
	`277`	`+ return priv->is_a2xx \|\| iommu_present(&platform_bus_type);`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`static int msm_init_vram(struct drm_device *dev)`