You might want to drop this one, it seems to be causing some issues on older generations.. I'll be sending another PR shortly with a revert. https://patchwork.freedesktop.org/patch/482453 BR, -R On Tue, Apr 19, 2022 at 11:15 AM Sasha Levin <sashal@xxxxxxxxxx> wrote: > > From: Robin Murphy <robin.murphy@xxxxxxx> > > [ Upstream commit e2a88eabb02410267519b838fb9b79f5206769be ] > > 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@xxxxxxx> > Reviewed-by: Rob Clark <robdclark@xxxxxxxxx> > Patchwork: https://patchwork.freedesktop.org/patch/480707/ > Link: https://lore.kernel.org/r/5ab4f4574d7f3e042261da702d493ee40d003356.1649168268.git.robin.murphy@xxxxxxx > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> > Signed-off-by: Rob Clark <robdclark@xxxxxxxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > drivers/gpu/drm/msm/msm_drv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 407b51cf6790..7322df9cf673 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -303,7 +303,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) > -- > 2.35.1 >
