Currently the GPU MMU is attached in the adreno_gpu code but as
more and more of the GPU initialization moves to the generic
GPU path we have a need to map and use GPU memory earlier and
earlier.  There isn't any reason to defer attaching the MMU
until later so attach it right after the address space is
created so it can be used immediately.

Signed-off-by: Jordan Crouse <jcro...@codeaurora.org>
---
 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 27 ++---------
 drivers/gpu/drm/msm/msm_gpu.c           | 83 ++++++++++++++++++++++-----------
 2 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c 
b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index b1c1639..634e724 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -330,11 +330,6 @@ void adreno_wait_ring(struct msm_gpu *gpu, uint32_t 
ndwords)
                DRM_ERROR("%s: timeout waiting for ringbuffer space\n", 
gpu->name);
 }
 
-static const char *iommu_ports[] = {
-               "gfx3d_user", "gfx3d_priv",
-               "gfx3d1_user", "gfx3d1_priv",
-};
-
 int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
                struct adreno_gpu *adreno_gpu, const struct adreno_gpu_funcs 
*funcs)
 {
@@ -366,15 +361,15 @@ int adreno_gpu_init(struct drm_device *drm, struct 
platform_device *pdev,
 
        adreno_gpu_config.ringsz = RB_SIZE;
 
+       pm_runtime_set_autosuspend_delay(&pdev->dev, DRM_MSM_INACTIVE_PERIOD);
+       pm_runtime_use_autosuspend(&pdev->dev);
+       pm_runtime_enable(&pdev->dev);
+
        ret = msm_gpu_init(drm, pdev, &adreno_gpu->base, &funcs->base,
                        adreno_gpu->info->name, &adreno_gpu_config);
        if (ret)
                return ret;
 
-       pm_runtime_set_autosuspend_delay(&pdev->dev, DRM_MSM_INACTIVE_PERIOD);
-       pm_runtime_use_autosuspend(&pdev->dev);
-       pm_runtime_enable(&pdev->dev);
-
        ret = request_firmware(&adreno_gpu->pm4, adreno_gpu->info->pm4fw, 
drm->dev);
        if (ret) {
                dev_err(drm->dev, "failed to load %s PM4 firmware: %d\n",
@@ -389,14 +384,6 @@ int adreno_gpu_init(struct drm_device *drm, struct 
platform_device *pdev,
                return ret;
        }
 
-       if (gpu->aspace && gpu->aspace->mmu) {
-               struct msm_mmu *mmu = gpu->aspace->mmu;
-               ret = mmu->funcs->attach(mmu, iommu_ports,
-                               ARRAY_SIZE(iommu_ports));
-               if (ret)
-                       return ret;
-       }
-
        adreno_gpu->memptrs_bo = msm_gem_new(drm, sizeof(*adreno_gpu->memptrs),
                        MSM_BO_UNCACHED);
        if (IS_ERR(adreno_gpu->memptrs_bo)) {
@@ -439,10 +426,4 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)
        release_firmware(adreno_gpu->pfp);
 
        msm_gpu_cleanup(gpu);
-
-       if (gpu->aspace) {
-               gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu,
-                       iommu_ports, ARRAY_SIZE(iommu_ports));
-               msm_gem_address_space_put(gpu->aspace);
-       }
 }
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 69bd60e..35533d3 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -577,11 +577,49 @@ static int get_clocks(struct platform_device *pdev, 
struct msm_gpu *gpu)
        return 0;
 }
 
+static struct msm_gem_address_space *
+msm_gpu_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev,
+               uint64_t va_start, uint64_t va_end)
+{
+       struct iommu_domain *iommu;
+       struct msm_gem_address_space *aspace;
+       int ret;
+
+       /*
+        * Setup IOMMU.. eventually we will (I think) do this once per context
+        * and have separate page tables per context.  For now, to keep things
+        * simple and to get something working, just use a single address space:
+        */
+       iommu = iommu_domain_alloc(&platform_bus_type);
+       if (!iommu)
+               return NULL;
+
+       iommu->geometry.aperture_start = va_start;
+       iommu->geometry.aperture_end = va_end;
+
+       dev_info(gpu->dev->dev, "%s: using IOMMU\n", gpu->name);
+
+       aspace = msm_gem_address_space_create(&pdev->dev, iommu, "gpu");
+       if (IS_ERR(aspace)) {
+               dev_err(gpu->dev->dev, "failed to init iommu: %ld\n",
+                       PTR_ERR(aspace));
+               iommu_domain_free(iommu);
+               return ERR_CAST(aspace);
+       }
+
+       ret = aspace->mmu->funcs->attach(aspace->mmu, NULL, 0);
+       if (ret) {
+               msm_gem_address_space_put(aspace);
+               return ERR_PTR(ret);
+       }
+
+       return aspace;
+}
+
 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, struct msm_gpu_config *config)
 {
-       struct iommu_domain *iommu;
        int ret;
 
        if (WARN_ON(gpu->num_perfcntrs > ARRAY_SIZE(gpu->last_cntrs)))
@@ -645,28 +683,19 @@ int msm_gpu_init(struct drm_device *drm, struct 
platform_device *pdev,
        if (IS_ERR(gpu->gpu_cx))
                gpu->gpu_cx = NULL;
 
-       /* Setup IOMMU.. eventually we will (I think) do this once per context
-        * and have separate page tables per context.  For now, to keep things
-        * simple and to get something working, just use a single address space:
-        */
-       iommu = iommu_domain_alloc(&platform_bus_type);
-       if (iommu) {
-               iommu->geometry.aperture_start = config->va_start;
-               iommu->geometry.aperture_end = config->va_end;
-
-               dev_info(drm->dev, "%s: using IOMMU\n", name);
-               gpu->aspace = msm_gem_address_space_create(&pdev->dev,
-                               iommu, "gpu");
-               if (IS_ERR(gpu->aspace)) {
-                       ret = PTR_ERR(gpu->aspace);
-                       dev_err(drm->dev, "failed to init iommu: %d\n", ret);
-                       gpu->aspace = NULL;
-                       iommu_domain_free(iommu);
-                       goto fail;
-               }
+       gpu->pdev = pdev;
+       platform_set_drvdata(pdev, gpu);
+
+       bs_init(gpu);
 
-       } else {
+       gpu->aspace = msm_gpu_create_address_space(gpu, pdev,
+               config->va_start, config->va_end);
+
+       if (gpu->aspace == NULL)
                dev_info(drm->dev, "%s: no IOMMU, fallback to VRAM 
carveout!\n", name);
+       else if (IS_ERR(gpu->aspace)) {
+               ret = PTR_ERR(gpu->aspace);
+               goto fail;
        }
 
        /* Create ringbuffer: */
@@ -678,14 +707,10 @@ int msm_gpu_init(struct drm_device *drm, struct 
platform_device *pdev,
                goto fail;
        }
 
-       gpu->pdev = pdev;
-       platform_set_drvdata(pdev, gpu);
-
-       bs_init(gpu);
-
        return 0;
 
 fail:
+       platform_set_drvdata(pdev, NULL);
        return ret;
 }
 
@@ -702,4 +727,10 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)
                        msm_gem_put_iova(gpu->rb->bo, gpu->aspace);
                msm_ringbuffer_destroy(gpu->rb);
        }
+
+       if (gpu->aspace) {
+               gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu,
+                       NULL, 0);
+               msm_gem_address_space_put(gpu->aspace);
+       }
 }
-- 
1.9.1

_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno

Reply via email to