drm/msm/gpu: add support for ocmem interconnect path

Some A3xx and all A4xx Adreno GPUs do not have GMEM inside the GPU core
and must use the On Chip MEMory (OCMEM) in order to be functional.
There's a separate interconnect path that needs to be setup to OCMEM.
Add support for this second path to the GPU core.

In the downstream MSM 3.4 sources, the two interconnect paths for the
GPU are between:

  - MSM_BUS_MASTER_GRAPHICS_3D and MSM_BUS_SLAVE_EBI_CH0
  - MSM_BUS_MASTER_V_OCMEM_GFX3D and MSM_BUS_SLAVE_OCMEM

Signed-off-by: Brian Masney <masneyb@onstation.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 0783e4b5486a48304b1ea5a59f24e87069bf5c21..d27bdc999777642f37f2fb1c986e11f39f6f432b 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -887,10 +887,21 @@ static int adreno_get_pwrlevels(struct device *dev,
        DBG("fast_rate=%u, slow_rate=27000000", gpu->fast_rate);
 
        /* Check for an interconnect path for the bus */
-       gpu->icc_path = of_icc_get(dev, NULL);
+       gpu->icc_path = of_icc_get(dev, "gfx-mem");
+       if (!gpu->icc_path) {
+               /*
+                * Keep compatbility with device trees that don't have an
+                * interconnect-names property.
+                */
+               gpu->icc_path = of_icc_get(dev, NULL);
+       }
        if (IS_ERR(gpu->icc_path))
                gpu->icc_path = NULL;
 
+       gpu->ocmem_icc_path = of_icc_get(dev, "ocmem");
+       if (IS_ERR(gpu->ocmem_icc_path))
+               gpu->ocmem_icc_path = NULL;
+
        return 0;
 }
 
@@ -977,6 +988,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)
                release_firmware(adreno_gpu->fw[i]);
 
        icc_put(gpu->icc_path);
+       icc_put(gpu->ocmem_icc_path);
 
        msm_gpu_cleanup(&adreno_gpu->base);
 }

diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index ab8f0f9c9dc8823bdf0fb8657b6942d6f41aee67..be5bc2e8425c579de32cd5015e3cc71bf005c1a0 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -111,8 +111,15 @@ struct msm_gpu {
        struct clk *ebi1_clk, *core_clk, *rbbmtimer_clk;
        uint32_t fast_rate;
 
+       /* The gfx-mem interconnect path that's used by all GPU types. */
        struct icc_path *icc_path;
 
+       /*
+        * Second interconnect path for some A3xx and all A4xx GPUs to the
+        * On Chip MEMory (OCMEM).
+        */
+       struct icc_path *ocmem_icc_path;
+
        /* Hang and Inactivity Detection:
         */
 #define DRM_MSM_INACTIVE_PERIOD   66 /* in ms (roughly four frames) */