diff options
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 38b7f4e9e7ff..51a95da694d8 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c | |||
@@ -975,7 +975,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, | |||
975 | 975 | ||
976 | size = PAGE_ALIGN(size); | 976 | size = PAGE_ALIGN(size); |
977 | 977 | ||
978 | if (!iommu_present(&platform_bus_type)) | 978 | if (!msm_use_mmu(dev)) |
979 | use_vram = true; | 979 | use_vram = true; |
980 | else if ((flags & (MSM_BO_STOLEN | MSM_BO_SCANOUT)) && priv->vram.size) | 980 | else if ((flags & (MSM_BO_STOLEN | MSM_BO_SCANOUT)) && priv->vram.size) |
981 | use_vram = true; | 981 | use_vram = true; |
@@ -1052,7 +1052,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, | |||
1052 | int ret, npages; | 1052 | int ret, npages; |
1053 | 1053 | ||
1054 | /* if we don't have IOMMU, don't bother pretending we can import: */ | 1054 | /* if we don't have IOMMU, don't bother pretending we can import: */ |
1055 | if (!iommu_present(&platform_bus_type)) { | 1055 | if (!msm_use_mmu(dev)) { |
1056 | DRM_DEV_ERROR(dev->dev, "cannot import without IOMMU\n"); | 1056 | DRM_DEV_ERROR(dev->dev, "cannot import without IOMMU\n"); |
1057 | return ERR_PTR(-EINVAL); | 1057 | return ERR_PTR(-EINVAL); |
1058 | } | 1058 | } |