Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm: stop supporting no-IOMMU configuration

With the switch to GPUVM the msm driver no longer supports the no-IOMMU
configurations (even without the actual GPU). Return an error in case we
face the lack of the IOMMU.

Fixes: 111fdd2198e6 ("drm/msm: drm_gpuvm conversion")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/672559/
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>

authored by

Dmitry Baryshkov and committed by
Rob Clark
c94fc6d3 cc64568b

+2 -3
+2 -3
drivers/gpu/drm/msm/msm_kms.c
··· 195 195 iommu_dev = mdp_dev; 196 196 else 197 197 iommu_dev = mdss_dev; 198 - 199 198 mmu = msm_iommu_disp_new(iommu_dev, 0); 200 199 if (IS_ERR(mmu)) 201 200 return ERR_CAST(mmu); 202 201 203 202 if (!mmu) { 204 - drm_info(dev, "no IOMMU, fallback to phys contig buffers for scanout\n"); 205 - return NULL; 203 + drm_info(dev, "no IOMMU, bailing out\n"); 204 + return ERR_PTR(-ENODEV); 206 205 } 207 206 208 207 vm = msm_gem_vm_create(dev, mmu, "mdp_kms",