Commit 171f580e authored by Rob Clark's avatar Rob Clark
Browse files

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: default avatarRob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/532617/
parent 38e27a6f

drivers/gpu/drm/msm/msm_gem_submit.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/msm/msm_gpu.c

+0 −4
Original line number Diff line number Diff line
@@ -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);



	/*

drivers/gpu/drm/msm/msm_rd.c

+8 −16
Original line number Diff line number Diff line
@@ -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