drm/msm: Move cmdstream dumping out of sched kthread

This is something that can block for arbitrary amounts of time as
userspace consumes from the FIFO.  So we don't really want this to
be in the fence signaling path.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/532617/

diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 38aa048471a83c0be2b7f4e526106de132006c18..3f1aa4de3b87302aaa1f48f999b37ef8d336454a 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -948,6 +948,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
        /* The scheduler owns a ref now: */
        msm_gem_submit_get(submit);
 
+       msm_rd_dump_submit(priv->rd, submit, NULL);
+
        drm_sched_entity_push_job(&submit->base);
 
        args->fence = submit->fence_id;

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 26ebda40be4f0c93574a9a21fef9be1c25d0a425..b1647b85101816888497ecd13e315d8874dce865 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -748,8 +748,6 @@ void msm_gpu_retire(struct msm_gpu *gpu)
 /* add bo's to gpu's ring, and kick gpu: */
 void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
 {
-       struct drm_device *dev = gpu->dev;
-       struct msm_drm_private *priv = dev->dev_private;
        struct msm_ringbuffer *ring = submit->ring;
        unsigned long flags;
 
@@ -761,8 +759,6 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
 
        submit->seqno = submit->hw_fence->seqno;
 
-       msm_rd_dump_submit(priv->rd, submit, NULL);
-
        update_sw_cntrs(gpu);
 
        /*

diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index db2f847c8535fc2c0768a62483db36da6a5e66e1..8d5687d5ed786ee2f3d7ba2bd5fbcf00fdd95838 100644 (file)
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -83,15 +83,10 @@ struct msm_rd_state {
 
        bool open;
 
-       /* current submit to read out: */
-       struct msm_gem_submit *submit;
-
        /* fifo access is synchronized on the producer side by
-        * gpu->lock held by submit code (otherwise we could
-        * end up w/ cmds logged in different order than they
-        * were executed).  And read_lock synchronizes the reads
+        * write_lock.  And read_lock synchronizes the reads
         */
-       struct mutex read_lock;
+       struct mutex read_lock, write_lock;
 
        wait_queue_head_t fifo_event;
        struct circ_buf fifo;
@@ -243,6 +238,7 @@ static void rd_cleanup(struct msm_rd_state *rd)
                return;
 
        mutex_destroy(&rd->read_lock);
+       mutex_destroy(&rd->write_lock);
        kfree(rd);
 }
 
@@ -258,6 +254,7 @@ static struct msm_rd_state *rd_init(struct drm_minor *minor, const char *name)
        rd->fifo.buf = rd->buf;
 
        mutex_init(&rd->read_lock);
+       mutex_init(&rd->write_lock);
 
        init_waitqueue_head(&rd->fifo_event);
 
@@ -338,19 +335,15 @@ static void snapshot_buf(struct msm_rd_state *rd,
        if (!(submit->bos[idx].flags & MSM_SUBMIT_BO_READ))
                return;
 
-       msm_gem_lock(&obj->base);
        buf = msm_gem_get_vaddr_active(&obj->base);
        if (IS_ERR(buf))
-               goto out_unlock;
+               return;
 
        buf += offset;
 
        rd_write_section(rd, RD_BUFFER_CONTENTS, buf, size);
 
        msm_gem_put_vaddr_locked(&obj->base);
-
-out_unlock:
-       msm_gem_unlock(&obj->base);
 }
 
 /* called under gpu->lock */
@@ -364,10 +357,7 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,
        if (!rd->open)
                return;
 
-       /* writing into fifo is serialized by caller, and
-        * rd->read_lock is used to serialize the reads
-        */
-       WARN_ON(!mutex_is_locked(&submit->gpu->lock));
+       mutex_lock(&rd->write_lock);
 
        if (fmt) {
                va_list args;
@@ -424,5 +414,7 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,
                        break;
                }
        }
+
+       mutex_unlock(&rd->write_lock);
 }
 #endif