[RFC PATCH v1 12/15] drm/msm: Add support to create target specific address spaces

[Jordan Crouse]

Add support to create a GPU target specific address space for
a context. For those targets that support per-instance
pagetables they will return a new address space set up for
the instance if possible otherwise just use the global
device pagetable.

Signed-off-by: Jordan Crouse <jcro...@codeaurora.org>
---

 drivers/gpu/drm/msm/msm_drv.c | 25 ++++++++++++++++++++++---
 drivers/gpu/drm/msm/msm_gpu.h |  1 +
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index cac2293..5b83093 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -605,6 +605,14 @@ static void load_gpu(struct drm_device *dev)
        mutex_unlock(&init_lock);
 }
 
+static struct msm_gem_address_space *context_address_space(struct msm_gpu *gpu)
+{
+       if (!gpu->funcs->new_address_space)
+               return gpu->aspace;
+
+       return gpu->funcs->new_address_space(gpu);
+}
+
 static int context_init(struct drm_device *dev, struct drm_file *file)
 {
        struct msm_drm_private *priv = dev->dev_private;
@@ -614,9 +622,16 @@ static int context_init(struct drm_device *dev, struct 
drm_file *file)
        if (!ctx)
                return -ENOMEM;
 
+       ctx->aspace = context_address_space(priv->gpu);
+       if (IS_ERR(ctx->aspace)) {
+               int ret = PTR_ERR(ctx->aspace);
+
+               kfree(ctx);
+               return ret;
+       }
+
        msm_submitqueue_init(dev, ctx);
 
-       ctx->aspace = priv->gpu->aspace;
        file->driver_priv = ctx;
 
        return 0;
@@ -632,8 +647,12 @@ static int msm_open(struct drm_device *dev, struct 
drm_file *file)
        return context_init(dev, file);
 }
 
-static void context_close(struct msm_file_private *ctx)
+static void context_close(struct msm_drm_private *priv,
+               struct msm_file_private *ctx)
 {
+       if (ctx->aspace != priv->gpu->aspace)
+               msm_gem_address_space_put(ctx->aspace);
+
        msm_submitqueue_close(ctx);
        kfree(ctx);
 }
@@ -648,7 +667,7 @@ static void msm_postclose(struct drm_device *dev, struct 
drm_file *file)
                priv->lastctx = NULL;
        mutex_unlock(&dev->struct_mutex);
 
-       context_close(ctx);
+       context_close(priv, ctx);
 }
 
 static irqreturn_t msm_irq(int irq, void *arg)
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index 81b9861..35b0faf 100644
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -76,6 +76,7 @@ struct msm_gpu_funcs {
        void (*gpu_set_freq)(struct msm_gpu *gpu, unsigned long freq);
        struct msm_gem_address_space *(*create_address_space)
                (struct msm_gpu *gpu);
+       struct msm_gem_address_space *(*new_address_space)(struct msm_gpu *gpu);
 };
 
 struct msm_gpu {
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel