drm/msm: add support for non-IOMMU systems

Add a VRAM carveout that is used for systems which do not have an IOMMU.

The VRAM carveout uses CMA.  The arch code must setup a CMA pool for the
device (preferrably in highmem.. a 256m-512m VRAM pool in lowmem is not
cool).  The user can configure the VRAM pool size using msm.vram module
param.

Technically, the abstraction of IOMMU behind msm_mmu is not strictly
needed, but it simplifies the GEM code a bit, and will be useful later
when I add support for a2xx devices with GPUMMU, so I decided to keep
this part.

It appears to be possible to configure the GPU to restrict access to
addresses within the VRAM pool, but this is not done yet.  So for now
the GPU will refuse to load if there is no sort of mmu.  Once address
based limits are supported and tested to confirm that we aren't giving
the GPU access to arbitrary memory, this restriction can be lifted

Signed-off-by: Rob Clark <robdclark@gmail.com>

1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 71f105f0d897..4ebce8be489d 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -17,6 +17,7 @@
 
 #include "msm_gpu.h"
 #include "msm_gem.h"
+#include "msm_mmu.h"
 
 
 /*
@@ -353,6 +354,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
                 struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs,
                 const char *name, const char *ioname, const char *irqname, int ringsz)
 {
+        struct iommu_domain *iommu;
         int i, ret;
 
         gpu->dev = drm;
@@ -418,13 +420,14 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
          * and have separate page tables per context.  For now, to keep things
          * simple and to get something working, just use a single address space:
          */
-        gpu->iommu = iommu_domain_alloc(&platform_bus_type);
-        if (!gpu->iommu) {
-                dev_err(drm->dev, "failed to allocate IOMMU\n");
-                ret = -ENOMEM;
-                goto fail;
+        iommu = iommu_domain_alloc(&platform_bus_type);
+        if (iommu) {
+                dev_info(drm->dev, "%s: using IOMMU\n", name);
+                gpu->mmu = msm_iommu_new(drm, iommu);
+        } else {
+                dev_info(drm->dev, "%s: no IOMMU, fallback to VRAM carveout!\n", name);
         }
-        gpu->id = msm_register_iommu(drm, gpu->iommu);
+        gpu->id = msm_register_mmu(drm, gpu->mmu);
 
         /* Create ringbuffer: */
         gpu->rb = msm_ringbuffer_new(gpu, ringsz);
@@ -464,6 +467,6 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)
                 msm_ringbuffer_destroy(gpu->rb);
         }
 
-        if (gpu->iommu)
-                iommu_domain_free(gpu->iommu);
+        if (gpu->mmu)
+                gpu->mmu->funcs->destroy(gpu->mmu);
 }