Skip to content

Commit c94fc6d

Browse files
lumagRob Clark
authored andcommitted
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: 111fdd2 ("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>
1 parent cc64568 commit c94fc6d

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/gpu/drm/msm/msm_kms.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,13 @@ struct drm_gpuvm *msm_kms_init_vm(struct drm_device *dev)
195195
iommu_dev = mdp_dev;
196196
else
197197
iommu_dev = mdss_dev;
198-
199198
mmu = msm_iommu_disp_new(iommu_dev, 0);
200199
if (IS_ERR(mmu))
201200
return ERR_CAST(mmu);
202201

203202
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);
206205
}
207206

208207
vm = msm_gem_vm_create(dev, mmu, "mdp_kms",

0 commit comments

Comments
 (0)