Pass the index of the MMU domain in struct msm_file_private instead
of assuming gpu->id throughout the submit path. This clears the way
to change ctx->aspace to a per-instance pagetable.

Signed-off-by: Jordan Crouse <jcro...@codeaurora.org>
---
 drivers/gpu/drm/msm/msm_drv.c        | 16 ++++------------
 drivers/gpu/drm/msm/msm_drv.h        |  1 +
 drivers/gpu/drm/msm/msm_gem.h        |  1 +
 drivers/gpu/drm/msm/msm_gem_submit.c | 13 ++++++++-----
 drivers/gpu/drm/msm/msm_gpu.c        |  5 ++---
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index d90ef1d78a1b..74dd09db93d7 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -502,6 +502,7 @@ static void load_gpu(struct drm_device *dev)
 
 static int context_init(struct drm_device *dev, struct drm_file *file)
 {
+       struct msm_drm_private *priv = dev->dev_private;
        struct msm_file_private *ctx;
 
        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
@@ -510,6 +511,7 @@ static int context_init(struct drm_device *dev, struct 
drm_file *file)
 
        msm_submitqueue_init(dev, ctx);
 
+       ctx->aspace = priv->gpu->aspace;
        file->driver_priv = ctx;
 
        return 0;
@@ -683,17 +685,6 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, 
void *data,
        return ret;
 }
 
-static int msm_ioctl_gem_info_iova(struct drm_device *dev,
-               struct drm_gem_object *obj, uint64_t *iova)
-{
-       struct msm_drm_private *priv = dev->dev_private;
-
-       if (!priv->gpu)
-               return -EINVAL;
-
-       return msm_gem_get_iova(obj, priv->gpu->aspace, iova);
-}
-
 static int msm_ioctl_gem_info(struct drm_device *dev, void *data,
                struct drm_file *file)
 {
@@ -709,9 +700,10 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void 
*data,
                return -ENOENT;
 
        if (args->flags & MSM_INFO_IOVA) {
+               struct msm_file_private *ctx = file->driver_priv;
                uint64_t iova;
 
-               ret = msm_ioctl_gem_info_iova(dev, obj, &iova);
+               ret = msm_gem_get_iova(obj, ctx->aspace, &iova);
                if (!ret)
                        args->offset = iova;
        } else {
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index 0a653dd2e618..0499b1708f52 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -59,6 +59,7 @@ struct msm_file_private {
        rwlock_t queuelock;
        struct list_head submitqueues;
        int queueid;
+       struct msm_gem_address_space *aspace;
 };
 
 enum msm_mdp_plane_property {
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index 9320e184b48d..a5e61259f40b 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -138,6 +138,7 @@ void msm_gem_vunmap(struct drm_gem_object *obj, enum 
msm_gem_lock subclass);
 struct msm_gem_submit {
        struct drm_device *dev;
        struct msm_gpu *gpu;
+       struct msm_gem_address_space *aspace;
        struct list_head node;   /* node in ring submit list */
        struct list_head bo_list;
        struct ww_acquire_ctx ticket;
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c 
b/drivers/gpu/drm/msm/msm_gem_submit.c
index b8dc8f96caf2..d14399c0dfb8 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -31,8 +31,9 @@
 #define BO_PINNED   0x2000
 
 static struct msm_gem_submit *submit_create(struct drm_device *dev,
-               struct msm_gpu *gpu, struct msm_gpu_submitqueue *queue,
-               uint32_t nr_bos, uint32_t nr_cmds)
+               struct msm_gpu *gpu, struct msm_gem_address_space *aspace,
+               struct msm_gpu_submitqueue *queue, uint32_t nr_bos,
+               uint32_t nr_cmds)
 {
        struct msm_gem_submit *submit;
        uint64_t sz = sizeof(*submit) + ((u64)nr_bos * sizeof(submit->bos[0])) +
@@ -46,6 +47,7 @@ static struct msm_gem_submit *submit_create(struct drm_device 
*dev,
                return NULL;
 
        submit->dev = dev;
+       submit->aspace = aspace;
        submit->gpu = gpu;
        submit->fence = NULL;
        submit->pid = get_pid(task_pid(current));
@@ -167,7 +169,7 @@ static void submit_unlock_unpin_bo(struct msm_gem_submit 
*submit,
        struct msm_gem_object *msm_obj = submit->bos[i].obj;
 
        if (submit->bos[i].flags & BO_PINNED)
-               msm_gem_put_iova(&msm_obj->base, submit->gpu->aspace);
+               msm_gem_put_iova(&msm_obj->base, submit->aspace);
 
        if (submit->bos[i].flags & BO_LOCKED)
                ww_mutex_unlock(&msm_obj->resv->lock);
@@ -270,7 +272,7 @@ static int submit_pin_objects(struct msm_gem_submit *submit)
 
                /* if locking succeeded, pin bo: */
                ret = msm_gem_get_iova(&msm_obj->base,
-                               submit->gpu->aspace, &iova);
+                               submit->aspace, &iova);
 
                if (ret)
                        break;
@@ -465,7 +467,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
                }
        }
 
-       submit = submit_create(dev, gpu, queue, args->nr_bos, args->nr_cmds);
+       submit = submit_create(dev, gpu, ctx->aspace, queue, args->nr_bos,
+               args->nr_cmds);
        if (!submit) {
                ret = -ENOMEM;
                goto out_unlock;
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index bd376f9e18a7..086fb347b554 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -551,7 +551,7 @@ static void retire_submit(struct msm_gpu *gpu, struct 
msm_gem_submit *submit)
                struct msm_gem_object *msm_obj = submit->bos[i].obj;
                /* move to inactive: */
                msm_gem_move_to_inactive(&msm_obj->base);
-               msm_gem_put_iova(&msm_obj->base, gpu->aspace);
+               msm_gem_put_iova(&msm_obj->base, submit->aspace);
                drm_gem_object_unreference(&msm_obj->base);
        }
 
@@ -635,8 +635,7 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct 
msm_gem_submit *submit,
 
                /* submit takes a reference to the bo and iova until retired: */
                drm_gem_object_reference(&msm_obj->base);
-               msm_gem_get_iova(&msm_obj->base,
-                               submit->gpu->aspace, &iova);
+               msm_gem_get_iova(&msm_obj->base, submit->aspace, &iova);
 
                if (submit->bos[i].flags & MSM_SUBMIT_BO_WRITE)
                        msm_gem_move_to_active(&msm_obj->base, gpu, true, 
submit->fence);
-- 
2.16.1

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

Reply via email to