drm/msm: Reduce fence signal latency
Subsystems (5)
cover drm/msm: Reduce fence signal latency
From: Rob Clark <[email protected]>
A couple tweaks to reduce fence signal latency.
Rob Clark (2):
drm/msm: Let fences read directly from memptrs
drm/msm: Signal fences sooner
drivers/gpu/drm/msm/msm_fence.c | 11 +++++-- drivers/gpu/drm/msm/msm_fence.h | 41 +++++++++++++++++++++++--- drivers/gpu/drm/msm/msm_gpu.c | 44 ++++++++++++++++------------ drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- 4 files changed, 73 insertions(+), 25 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 drm/msm: Let fences read directly from memptrs
From: Rob Clark <[email protected]>
Let dma_fence::signaled, etc, read directly from the address that the hw is writing with updated completed fence seqno, so we can potentially notice that the fence is signaled sooner.
Plus add some docs.
--- drivers/gpu/drm/msm/msm_fence.c | 11 ++++++-- drivers/gpu/drm/msm/msm_fence.h | 41 +++++++++++++++++++++++++--- drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- 3 files changed, 47 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/msm_fence.c +9 -2
@@ -11,7 +11,8 @@struct msm_fence_context * -msm_fence_context_alloc (struct drm_device *dev,const char *name) +msm_fence_context_alloc (struct drm_device *dev,volatile uint32_t *fenceptr, +const char *name) {struct msm_fence_context *fctx;
@@ -22,6 +23,7 @@ msm_fence_context_alloc(struct drm_device *dev, const char *name) fctx->dev = dev;strncpy (fctx->name, name,sizeof (fctx->name)); fctx->context =dma_fence_context_alloc (1 ); + fctx->fenceptr = fenceptr;init_waitqueue_head (&fctx->event);spin_lock_init (&fctx->spinlock);
@@ -35,7 +37,12 @@ void msm_fence_context_free(struct msm_fence_context *fctx)static inline bool fence_completed (struct msm_fence_context *fctx,uint32_t fence) { -return (int32_t )(fctx->completed_fence - fence) >=0 ; +/* +* Note: Check completed_fence first, as fenceptr is in a write-combine +* mapping, so it will be more expensive to read. +*/ +return (int32_t )(fctx->completed_fence - fence) >=0 || + (int32_t )(*fctx->fenceptr - fence) >=0 ; }/* legacy path for WAIT_FENCE ioctl: */
drivers/gpu/drm/msm/msm_fence.h +37 -4
56 lines not on this page · raw message
drivers/gpu/drm/msm/msm_ringbuffer.c +1 -1
@@ -51,7 +51,7 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id,snprintf (name,sizeof (name),"gpu-ring-%d" , ring->id); - ring->fctx =msm_fence_context_alloc (gpu->dev, name); + ring->fctx =msm_fence_context_alloc (gpu->dev, &ring->memptrs->fence, name);return ring;
Signature · 1 line
2.31.1
PATCH 2/2 drm/msm: Signal fences sooner
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Nothing we do to in update_fences() can't be done in an atomic context, so move this into the GPU's irq context to reduce latency (and call dma_fence_signal() so we aren't relying on dma_fence_is_signaled() which would defeat the purpose).
--- drivers/gpu/drm/msm/msm_gpu.c | 44 +++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 18 deletions(-)
drivers/gpu/drm/msm/msm_gpu.c +26 -18
@@ -278,16 +278,18 @@ static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring, uint32_t fence) {struct msm_gem_submit *submit; +unsigned long flags; -spin_lock (&ring->submit_lock); +spin_lock_irqsave (&ring->submit_lock, flags);list_for_each_entry (submit, &ring->submits, node) {if (submit->seqno > fence)break ;msm_update_fence (submit->ring->fctx, submit->fence->seqno); +dma_fence_signal (submit->fence); } -spin_unlock (&ring->submit_lock); +spin_unlock_irqrestore (&ring->submit_lock, flags); }#ifdef CONFIG_DEV_COREDUMP
@@ -443,15 +445,16 @@ static struct msm_gem_submit * find_submit(struct msm_ringbuffer *ring, uint32_t fence) {struct msm_gem_submit *submit; +unsigned long flags; -spin_lock (&ring->submit_lock); +spin_lock_irqsave (&ring->submit_lock, flags);list_for_each_entry (submit, &ring->submits, node) {if (submit->seqno == fence) { -spin_unlock (&ring->submit_lock); +spin_unlock_irqrestore (&ring->submit_lock, flags);return submit; } } -spin_unlock (&ring->submit_lock); +spin_unlock_irqrestore (&ring->submit_lock, flags);return NULL ; }
@@ -547,11 +550,12 @@ static void recover_worker(struct kthread_work *work)*/ for (i =0 ; i < gpu->nr_rings; i++) {struct msm_ringbuffer *ring = gpu->rb[i]; +unsigned long flags; -spin_lock (&ring->submit_lock); +spin_lock_irqsave (&ring->submit_lock, flags);list_for_each_entry (submit, &ring->submits, node) gpu->funcs->submit (gpu, submit); -spin_unlock (&ring->submit_lock); +spin_unlock_irqrestore (&ring->submit_lock, flags); } }
@@ -641,7 +645,7 @@ static void hangcheck_handler(struct timer_list *t)hangcheck_timer_reset (gpu);/* workaround for missing irq: */ -kthread_queue_work (gpu->worker, &gpu->retire_work); +msm_gpu_retire (gpu); }/*
@@ -752,6 +756,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring,int index = submit->seqno %MSM_GPU_SUBMIT_STATS_COUNT ;volatile struct msm_gpu_submit_stats *stats;u64 elapsed, clock =0 ; +unsigned long flags;int i; stats = &ring->memptrs->stats[index];
@@ -781,9 +786,9 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring,pm_runtime_mark_last_busy (&gpu->pdev->dev);pm_runtime_put_autosuspend (&gpu->pdev->dev); -spin_lock (&ring->submit_lock); +spin_lock_irqsave (&ring->submit_lock, flags);list_del (&submit->node); -spin_unlock (&ring->submit_lock); +spin_unlock_irqrestore (&ring->submit_lock, flags);msm_gem_submit_put (submit); }
@@ -798,11 +803,12 @@ static void retire_submits(struct msm_gpu *gpu)while (true) {struct msm_gem_submit *submit =NULL ; +unsigned long flags; -spin_lock (&ring->submit_lock); +spin_lock_irqsave (&ring->submit_lock, flags); submit =list_first_entry_or_null (&ring->submits, struct msm_gem_submit, node); -spin_unlock (&ring->submit_lock); +spin_unlock_irqrestore (&ring->submit_lock, flags);/* * If no submit, we are done. If submit->fence hasn't
@@ -821,10 +827,6 @@ static void retire_submits(struct msm_gpu *gpu)static void retire_worker (struct kthread_work *work) { struct msm_gpu *gpu = container_of(work, struct msm_gpu, retire_work); -int i; - -for (i =0 ; i < gpu->nr_rings; i++) -update_fences (gpu, gpu->rb[i], gpu->rb[i]->memptrs->fence);retire_submits (gpu); }
@@ -832,6 +834,11 @@ static void retire_worker(struct kthread_work *work)/* call from irq handler to schedule work to retire bo's */ void msm_gpu_retire (struct msm_gpu *gpu) { +int i; + +for (i =0 ; i < gpu->nr_rings; i++) +update_fences (gpu, gpu->rb[i], gpu->rb[i]->memptrs->fence); +kthread_queue_work (gpu->worker, &gpu->retire_work);update_sw_cntrs (gpu); }
@@ -842,6 +849,7 @@ 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;int i;WARN_ON (!mutex_is_locked (&dev->struct_mutex));
@@ -879,9 +887,9 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)*/ msm_gem_submit_get (submit); -spin_lock (&ring->submit_lock); +spin_lock_irqsave (&ring->submit_lock, flags);list_add_tail (&submit->node, &ring->submits); -spin_unlock (&ring->submit_lock); +spin_unlock_irqrestore (&ring->submit_lock, flags); gpu->funcs->submit (gpu, submit); priv->lastctx = submit->queue->ctx;
Signature · 1 line
2.31.1