1 files changed, 16 insertions, 26 deletions

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 4583d61556f5..0cfe3f426ee4 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"
 
 
 /*
@@ -25,20 +26,10 @@
 
 #ifdef CONFIG_MSM_BUS_SCALING
 #include <mach/board.h>
-#include <mach/kgsl.h>
-static void bs_init(struct msm_gpu *gpu, struct platform_device *pdev)
+static void bs_init(struct msm_gpu *gpu)
 {
-        struct drm_device *dev = gpu->dev;
-        struct kgsl_device_platform_data *pdata;
-
-        if (!pdev) {
-                dev_err(dev->dev, "could not find dtv pdata\n");
-                return;
-        }
-
-        pdata = pdev->dev.platform_data;
-        if (pdata->bus_scale_table) {
-                gpu->bsc = msm_bus_scale_register_client(pdata->bus_scale_table);
+        if (gpu->bus_scale_table) {
+                gpu->bsc = msm_bus_scale_register_client(gpu->bus_scale_table);
                 DBG("bus scale client: %08x", gpu->bsc);
         }
 }
@@ -59,7 +50,7 @@ static void bs_set(struct msm_gpu *gpu, int idx)
         }
 }
 #else
-static void bs_init(struct msm_gpu *gpu, struct platform_device *pdev) {}
+static void bs_init(struct msm_gpu *gpu) {}
 static void bs_fini(struct msm_gpu *gpu) {}
 static void bs_set(struct msm_gpu *gpu, int idx) {}
 #endif
@@ -307,8 +298,6 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
         struct msm_drm_private *priv = dev->dev_private;
         int i, ret;
 
-        mutex_lock(&dev->struct_mutex);
-
         submit->fence = ++priv->next_fence;
 
         gpu->submitted_fence = submit->fence;
@@ -340,7 +329,6 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
                         msm_gem_move_to_active(&msm_obj->base, gpu, true, submit->fence);
         }
         hangcheck_timer_reset(gpu);
-        mutex_unlock(&dev->struct_mutex);
 
         return ret;
 }
@@ -363,6 +351,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;
@@ -428,13 +417,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);
@@ -452,7 +442,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
                 goto fail;
         }
 
-        bs_init(gpu, pdev);
+        bs_init(gpu);
 
         return 0;
 
@@ -474,6 +464,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);
 }