Commit 8cb72adb authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Rob Clark
Browse files

drm/msm: Stop using iommu_present() 



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.

On Qualcomm platforms the IOMMU can be specified either for the MDP/DPU
device or for its parent MDSS device depending on the actual platform.
Check both of them, since that is how both DPU and MDP5 drivers work.

Co-developed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/489699/
Link: https://lore.kernel.org/r/20220616081106.350262-4-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 8010b14e

drivers/gpu/drm/msm/msm_drv.c

+8 −2
Original line number Diff line number Diff line
@@ -271,8 +271,14 @@ 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);

	/*

	 * a2xx comes with its own MMU

	 * On other platforms IOMMU can be declared specified either for the

	 * MDP/DPU device or for its parent, MDSS device.

	 */

	return priv->is_a2xx ||

		device_iommu_mapped(dev->dev) ||

		device_iommu_mapped(dev->dev->parent);

}



static int msm_init_vram(struct drm_device *dev)