drm/msm: deal with arbitrary # of cmd buffers

For some optimizations coming on the userspace side, splitting larger
draw or gmem cmds into multiple cmdstream buffers, we need to support
much more than the previous small/arbitrary limit.

Signed-off-by: Rob Clark <robdclark@gmail.com>

3 files changed, 8 insertions, 18 deletions

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 7dfe22ea2920..f386f463278d 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -139,7 +139,7 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
         struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
         struct msm_drm_private *priv = gpu->dev->dev_private;
         struct msm_ringbuffer *ring = gpu->rb;
-        unsigned i, ibs = 0;
+        unsigned i;
 
         for (i = 0; i < submit->nr_cmds; i++) {
                 switch (submit->cmd[i].type) {
@@ -155,18 +155,11 @@ void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
                                 CP_INDIRECT_BUFFER_PFE : CP_INDIRECT_BUFFER_PFD, 2);
                         OUT_RING(ring, submit->cmd[i].iova);
                         OUT_RING(ring, submit->cmd[i].size);
-                        ibs++;
+                        OUT_PKT2(ring);
                         break;
                 }
         }
 
-        /* on a320, at least, we seem to need to pad things out to an
-         * even number of qwords to avoid issue w/ CP hanging on wrap-
-         * around:
-         */
-        if (ibs % 2)
-                OUT_PKT2(ring);
-
         OUT_PKT0(ring, REG_AXXX_CP_SCRATCH_REG2, 1);
         OUT_RING(ring, submit->fence->seqno);
 
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index 7a4da819731a..b2f13cfe945e 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -93,8 +93,6 @@ static inline bool is_vunmapable(struct msm_gem_object *msm_obj)
         return (msm_obj->vmap_count == 0) && msm_obj->vaddr;
 }
 
-#define MAX_CMDS 4
-
 /* Created per submit-ioctl, to track bo's and cmdstream bufs, etc,
  * associated with the cmdstream submission for synchronization (and
  * make it easier to unwind when things go wrong, etc).  This only
@@ -116,7 +114,7 @@ struct msm_gem_submit {
                 uint32_t size;  /* in dwords */
                 uint32_t iova;
                 uint32_t idx;   /* cmdstream buffer idx in bos[] */
-        } cmd[MAX_CMDS];
+        } *cmd;  /* array of size nr_cmds */
         struct {
                 uint32_t flags;
                 struct msm_gem_object *obj;
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 736f15881b6a..9766f9ae4b7d 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -29,10 +29,11 @@
 #define BO_PINNED   0x2000
 
 static struct msm_gem_submit *submit_create(struct drm_device *dev,
-                struct msm_gpu *gpu, int nr)
+                struct msm_gpu *gpu, int nr_bos, int nr_cmds)
 {
         struct msm_gem_submit *submit;
-        int sz = sizeof(*submit) + (nr * sizeof(submit->bos[0]));
+        int sz = sizeof(*submit) + (nr_bos * sizeof(submit->bos[0])) +
+                        (nr_cmds * sizeof(*submit->cmd));
 
         submit = kmalloc(sz, GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY);
         if (!submit)
@@ -42,6 +43,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
         submit->gpu = gpu;
         submit->fence = NULL;
         submit->pid = get_pid(task_pid(current));
+        submit->cmd = (void *)&submit->bos[nr_bos];
 
         /* initially, until copy_from_user() and bo lookup succeeds: */
         submit->nr_bos = 0;
@@ -371,14 +373,11 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
         if (args->pipe != MSM_PIPE_3D0)
                 return -EINVAL;
 
-        if (args->nr_cmds > MAX_CMDS)
-                return -EINVAL;
-
         ret = mutex_lock_interruptible(&dev->struct_mutex);
         if (ret)
                 return ret;
 
-        submit = submit_create(dev, gpu, args->nr_bos);
+        submit = submit_create(dev, gpu, args->nr_bos, args->nr_cmds);
         if (!submit) {
                 ret = -ENOMEM;
                 goto out_unlock;