drm/amdgpu: busywait KIQ register accessing v3
Subsystems (3)
PATCH 3/3 drm/amdgpu: busywait KIQ register accessing v3
From: pding <[email protected]>
Register accessing is performed when IRQ is disabled. Never sleep in this function.
Known issue: dead sleep in many use cases of index/data registers.
v2: wrap polling fence functions. don't trigger IRQ for polling in case of wrongly fence signal.
v3: handle wrap round gracefully. add comments
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 30 ++++++-------- 8 files changed, 75 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -885,7 +885,7 @@ struct amdgpu_mec {struct amdgpu_kiq {u64 eop_gpu_addr;struct amdgpu_bo *eop_obj; -struct mutex ring_mutex; +spinlock_t ring_lock;struct amdgpu_ring ring;struct amdgpu_irq_src irq; };
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +2 -2
@@ -788,7 +788,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid)struct dma_fence *f;struct amdgpu_ring *ring = &adev->gfx.kiq.ring; -mutex_lock (&adev->gfx.kiq.ring_mutex); +spin_lock (&adev->gfx.kiq.ring_lock);amdgpu_ring_alloc (ring,12 );/* fence + invalidate_tlbs package*/ amdgpu_ring_write (ring,PACKET3 (PACKET3_INVALIDATE_TLBS ,0 )); amdgpu_ring_write(ring,
@@ -796,7 +796,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) PACKET3_INVALIDATE_TLBS_PASID(pasid));amdgpu_fence_emit (ring, &f);amdgpu_ring_commit (ring); -mutex_unlock (&adev->gfx.kiq.ring_mutex); +spin_unlock (&adev->gfx.kiq.ring_lock); r =dma_fence_wait (f, false);if (r)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2 -2
@@ -973,7 +973,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid)struct dma_fence *f;struct amdgpu_ring *ring = &adev->gfx.kiq.ring; -mutex_lock (&adev->gfx.kiq.ring_mutex); +spin_lock (&adev->gfx.kiq.ring_lock);amdgpu_ring_alloc (ring,12 );/* fence + invalidate_tlbs package*/ amdgpu_ring_write (ring,PACKET3 (PACKET3_INVALIDATE_TLBS ,0 )); amdgpu_ring_write(ring,
@@ -983,7 +983,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) PACKET3_INVALIDATE_TLBS_FLUSH_TYPE(2));amdgpu_fence_emit (ring, &f);amdgpu_ring_commit (ring); -mutex_unlock (&adev->gfx.kiq.ring_mutex); +spin_unlock (&adev->gfx.kiq.ring_lock); r =dma_fence_wait (f, false);if (r)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -6
@@ -109,10 +109,8 @@ uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg, {uint32_t ret; -if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev)) { -BUG_ON (in_interrupt ()); +if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))return amdgpu_virt_kiq_rreg (adev, reg); - }if ((reg *4 ) < adev->rmmio_size && !(acc_flags &AMDGPU_REGS_IDX )) ret =readl (((void __iomem *)adev->rmmio) + (reg *4 ));
@@ -137,10 +135,8 @@ void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, adev->last_mm_index = v; } -if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev)) { -BUG_ON (in_interrupt ()); +if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))return amdgpu_virt_kiq_wreg (adev, reg, v); - }if ((reg *4 ) < adev->rmmio_size && !(acc_flags &AMDGPU_REGS_IDX ))writel (v, ((void __iomem *)adev->rmmio) + (reg *4 ));
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +50 -0
62 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -1
@@ -185,7 +185,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev,struct amdgpu_kiq *kiq = &adev->gfx.kiq;int r =0 ; -mutex_init (&kiq->ring_mutex); +spin_lock_init (&kiq->ring_lock); r =amdgpu_wb_get (adev, &adev->virt.reg_val_offs);if (r)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +4 -0
@@ -89,8 +89,12 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,void amdgpu_fence_driver_suspend (struct amdgpu_device *adev);void amdgpu_fence_driver_resume (struct amdgpu_device *adev);int amdgpu_fence_emit (struct amdgpu_ring *ring,struct dma_fence **fence); +int amdgpu_fence_emit_polling (struct amdgpu_ring *ring,uint32_t *s);void amdgpu_fence_process (struct amdgpu_ring *ring);int amdgpu_fence_wait_empty (struct amdgpu_ring *ring); +signed long amdgpu_fence_wait_polling (struct amdgpu_ring *ring, +uint32_t wait_seq, +signed long timeout);unsigned amdgpu_fence_count_emitted (struct amdgpu_ring *ring);/*
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +13 -17
@@ -22,7 +22,7 @@*/ #include "amdgpu.h" -#define MAX_KIQ_REG_WAIT 100000 +#define MAX_KIQ_REG_WAIT 100000000/* in usecs */ int amdgpu_allocate_static_csa (struct amdgpu_device *adev) {
@@ -114,27 +114,24 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)uint32_t amdgpu_virt_kiq_rreg (struct amdgpu_device *adev,uint32_t reg) {signed long r; -uint32_t val; -struct dma_fence *f; +uint32_t val, seq;struct amdgpu_kiq *kiq = &adev->gfx.kiq;struct amdgpu_ring *ring = &kiq->ring;BUG_ON (!ring->funcs->emit_rreg); -mutex_lock (&kiq->ring_mutex); +spin_lock (&kiq->ring_lock);amdgpu_ring_alloc (ring,32 );amdgpu_ring_emit_rreg (ring, reg); -amdgpu_fence_emit (ring, &f); +amdgpu_fence_emit_polling (ring, &seq);amdgpu_ring_commit (ring); -mutex_unlock (&kiq->ring_mutex); +spin_unlock (&kiq->ring_lock); - r =dma_fence_wait_timeout (f, false,msecs_to_jiffies (MAX_KIQ_REG_WAIT )); -dma_fence_put (f); + r =amdgpu_fence_wait_polling (ring, seq,MAX_KIQ_REG_WAIT );if (r <1 ) { -DRM_ERROR ("wait for kiq fence error: %ld.\n" , r); +DRM_ERROR ("wait for kiq fence error: %ld\n" , r);return ~0 ; } - val = adev->wb.wb[adev->virt.reg_val_offs];return val;
@@ -143,23 +140,22 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)void amdgpu_virt_kiq_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v) {signed long r; -struct dma_fence *f; +uint32_t seq;struct amdgpu_kiq *kiq = &adev->gfx.kiq;struct amdgpu_ring *ring = &kiq->ring;BUG_ON (!ring->funcs->emit_wreg); -mutex_lock (&kiq->ring_mutex); +spin_lock (&kiq->ring_lock);amdgpu_ring_alloc (ring,32 );amdgpu_ring_emit_wreg (ring, reg, v); -amdgpu_fence_emit (ring, &f); +amdgpu_fence_emit_polling (ring, &seq);amdgpu_ring_commit (ring); -mutex_unlock (&kiq->ring_mutex); +spin_unlock (&kiq->ring_lock); - r =dma_fence_wait_timeout (f, false,msecs_to_jiffies (MAX_KIQ_REG_WAIT )); + r =amdgpu_fence_wait_polling (ring, seq,MAX_KIQ_REG_WAIT );if (r <1 ) -DRM_ERROR ("wait for kiq fence error: %ld.\n" , r); -dma_fence_put (f); +DRM_ERROR ("wait for kiq fence error: %ld\n" , r); }/**
Signature · 6 lines
2.9.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1508288192-22217-1-git-send-email-Pixel.Ding-5C7GfCeVMHo@public.gmane.org
Am 18.10.2017 um 02:56 schrieb Pixel Ding:
Quoted 162 lines
From: pding <[email protected]>
Register accessing is performed when IRQ is disabled. Never sleep in this function.
Known issue: dead sleep in many use cases of index/data registers.
v2: wrap polling fence functions. don't trigger IRQ for polling in case of wrongly fence signal.
v3: handle wrap round gracefully. add comments
Signed-off-by pding <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 30 ++++++-------- 8 files changed, 75 insertions(+), 29 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -885,7 +885,7 @@ struct amdgpu_mec {struct amdgpu_kiq {u64 eop_gpu_addr;struct amdgpu_bo *eop_obj; -struct mutex ring_mutex; +spinlock_t ring_lock;struct amdgpu_ring ring;struct amdgpu_irq_src irq; };drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +2
-2@@ -788,7 +788,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid)struct dma_fence *f;struct amdgpu_ring *ring = &adev->gfx.kiq.ring; -mutex_lock (&adev->gfx.kiq.ring_mutex); +spin_lock (&adev->gfx.kiq.ring_lock);amdgpu_ring_alloc (ring,12 );/* fence + invalidate_tlbs package*/ amdgpu_ring_write (ring,PACKET3 (PACKET3_INVALIDATE_TLBS ,0 )); amdgpu_ring_write(ring,@@ -796,7 +796,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) PACKET3_INVALIDATE_TLBS_PASID(pasid));amdgpu_fence_emit (ring, &f);amdgpu_ring_commit (ring); -mutex_unlock (&adev->gfx.kiq.ring_mutex); +spin_unlock (&adev->gfx.kiq.ring_lock); r =dma_fence_wait (f, false);if (r)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2
-2@@ -973,7 +973,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid)struct dma_fence *f;struct amdgpu_ring *ring = &adev->gfx.kiq.ring; -mutex_lock (&adev->gfx.kiq.ring_mutex); +spin_lock (&adev->gfx.kiq.ring_lock);amdgpu_ring_alloc (ring,12 );/* fence + invalidate_tlbs package*/ amdgpu_ring_write (ring,PACKET3 (PACKET3_INVALIDATE_TLBS ,0 )); amdgpu_ring_write(ring,@@ -983,7 +983,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) PACKET3_INVALIDATE_TLBS_FLUSH_TYPE(2));amdgpu_fence_emit (ring, &f);amdgpu_ring_commit (ring); -mutex_unlock (&adev->gfx.kiq.ring_mutex); +spin_unlock (&adev->gfx.kiq.ring_lock); r =dma_fence_wait (f, false);if (r)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-6@@ -109,10 +109,8 @@ uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg, {uint32_t ret; -if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev)) { -BUG_ON (in_interrupt ()); +if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))return amdgpu_virt_kiq_rreg (adev, reg); - }if ((reg *4 ) < adev->rmmio_size && !(acc_flags &AMDGPU_REGS_IDX )) ret =readl (((void __iomem *)adev->rmmio) + (reg *4 ));@@ -137,10 +135,8 @@ void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, adev->last_mm_index = v; } -if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev)) { -BUG_ON (in_interrupt ()); +if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))return amdgpu_virt_kiq_wreg (adev, reg, v); - }if ((reg *4 ) < adev->rmmio_size && !(acc_flags &AMDGPU_REGS_IDX ))writel (v, ((void __iomem *)adev->rmmio) + (reg *4 ));drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +38
-0@@ -169,6 +169,32 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct dma_fence **f) }/** +* amdgpu_fence_emit_polling - emit a fence on the requeste ring +* +* @ring: ring the fence is associated with +* @s: resulting sequence number +* +* Emits a fence command on the requested ring (all asics). +* Used For polling fence. +* Returns 0 on success, -ENOMEM on failure. +*/ +int amdgpu_fence_emit_polling (struct amdgpu_ring *ring,uint32_t *s) +{ +uint32_t seq; + +if (!s) +return -EINVAL ; + + seq = ++ring->fence_drv.sync_seq; +amdgpu_ring_emit_fence (ring, ring->fence_drv.gpu_addr, + seq,AMDGPU_FENCE_FLAG_INT ); + + *s = seq; + +return 0 ; +} + +/** * amdgpu_fence_schedule_fallback - schedule fallback check * * @ring: pointer to struct amdgpu_ring @@ -282,6 +308,30 @@ int amdgpu_fence_wait_empty(struct amdgpu_ring *ring) }/** +* amdgpu_fence_wait_polling - busy wait for givn sequence number +* +* @ring: ring index the fence is associated with +* @wait_seq: sequence number to wait +* @timeout: the timeout for waiting in usecs +* +* Wait for all fences on the requested ring to signal (all asics). +* Returns left time if no timeout, 0 or minus if timeout. +*/ +signed long amdgpu_fence_wait_polling (struct amdgpu_ring *ring, +uint32_t wait_seq, +signed long timeout)
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c int amdgpu_fence_wait_empty(struct amdgpu_ring *ring) · line 332
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +10
-0+{ +uint32_t seq; + +do { + seq =amdgpu_fence_read (ring); +udelay (5 ); + timeout -=5 ; + }while ((int32_t )(wait_seq - seq) >0 && timeout >0 ); + +return timeout;
Might be a good idea to avoid returning a negative timeout here to avoid confusion with some error code. E.g. just "return timeout > 0 ? timeout : 0".
Apart from that the patch looks good to me and is Reviewed-by: Christian König <[email protected]>.
Regards,
Christian.
Quoted 102 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +2
-0+} +/** * amdgpu_fence_count_emitted - get the count of emitted fences * * @ring: ring the fence is associated with drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1
-1@@ -185,7 +185,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev,struct amdgpu_kiq *kiq = &adev->gfx.kiq;int r =0 ; -mutex_init (&kiq->ring_mutex); +spin_lock_init (&kiq->ring_lock); r =amdgpu_wb_get (adev, &adev->virt.reg_val_offs);if (r)drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +4
-0@@ -89,8 +89,12 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,void amdgpu_fence_driver_suspend (struct amdgpu_device *adev);void amdgpu_fence_driver_resume (struct amdgpu_device *adev);int amdgpu_fence_emit (struct amdgpu_ring *ring,struct dma_fence **fence); +int amdgpu_fence_emit_polling (struct amdgpu_ring *ring,uint32_t *s);void amdgpu_fence_process (struct amdgpu_ring *ring);int amdgpu_fence_wait_empty (struct amdgpu_ring *ring); +signed long amdgpu_fence_wait_polling (struct amdgpu_ring *ring, +uint32_t wait_seq, +signed long timeout);unsigned amdgpu_fence_count_emitted (struct amdgpu_ring *ring);/* drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +11
-14@@ -22,7 +22,7 @@*/ #include "amdgpu.h" -#define MAX_KIQ_REG_WAIT 100000 +#define MAX_KIQ_REG_WAIT 100000000/* in usecs */ int amdgpu_allocate_static_csa (struct amdgpu_device *adev) {@@ -114,27 +114,24 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)uint32_t amdgpu_virt_kiq_rreg (struct amdgpu_device *adev,uint32_t reg) {signed long r; -uint32_t val; -struct dma_fence *f; +uint32_t val, seq;struct amdgpu_kiq *kiq = &adev->gfx.kiq;struct amdgpu_ring *ring = &kiq->ring;BUG_ON (!ring->funcs->emit_rreg); -mutex_lock (&kiq->ring_mutex); +spin_lock (&kiq->ring_lock);amdgpu_ring_alloc (ring,32 );amdgpu_ring_emit_rreg (ring, reg); -amdgpu_fence_emit (ring, &f); +amdgpu_fence_emit_polling (ring, &seq);amdgpu_ring_commit (ring); -mutex_unlock (&kiq->ring_mutex); +spin_unlock (&kiq->ring_lock); - r =dma_fence_wait_timeout (f, false,msecs_to_jiffies (MAX_KIQ_REG_WAIT )); -dma_fence_put (f); + r =amdgpu_fence_wait_polling (ring, seq,MAX_KIQ_REG_WAIT );if (r <1 ) { -DRM_ERROR ("wait for kiq fence error: %ld.\n" , r); +DRM_ERROR ("wait for kiq fence error: %ld\n" , r);return ~0 ; } - val = adev->wb.wb[adev->virt.reg_val_offs];return val;@@ -143,23 +140,22 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)void amdgpu_virt_kiq_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v) {signed long r; -struct dma_fence *f; +uint32_t seq;struct amdgpu_kiq *kiq = &adev->gfx.kiq;struct amdgpu_ring *ring = &kiq->ring;BUG_ON (!ring->funcs->emit_wreg); -mutex_lock (&kiq->ring_mutex); +spin_lock (&kiq->ring_lock);amdgpu_ring_alloc (ring,32 );amdgpu_ring_emit_wreg (ring, reg, v); -amdgpu_fence_emit (ring, &f); +amdgpu_fence_emit_polling (ring, &seq);amdgpu_ring_commit (ring); -mutex_unlock (&kiq->ring_mutex); +spin_unlock (&kiq->ring_lock);
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) · line 161
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +2
-3- r =dma_fence_wait_timeout (f, false,msecs_to_jiffies (MAX_KIQ_REG_WAIT )); + r =amdgpu_fence_wait_polling (ring, seq,MAX_KIQ_REG_WAIT );if (r <1 ) -DRM_ERROR ("wait for kiq fence error: %ld.\n" , r); -dma_fence_put (f); +DRM_ERROR ("wait for kiq fence error: %ld\n" , r); }/**
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 0829c356-a90d-a847-bf1b-5e3659243311-5C7GfCeVMHo@public.gmane.org
Thanks Christian:) will change the return value as you suggested. —
Sincerely Yours,
Pixel
Quoted 295 lines · Christian
Am 18.10.2017 um 02:56 schrieb Pixel Ding:
Quoted 162 lines
From: pding <[email protected]>
Register accessing is performed when IRQ is disabled. Never sleep in this function.
Known issue: dead sleep in many use cases of index/data registers.
v2: wrap polling fence functions. don't trigger IRQ for polling in case of wrongly fence signal.
v3: handle wrap round gracefully. add comments
Signed-off-by pding <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 50 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 30 ++++++-------- 8 files changed, 75 insertions(+), 29 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -885,7 +885,7 @@ struct amdgpu_mec {struct amdgpu_kiq {u64 eop_gpu_addr;struct amdgpu_bo *eop_obj; -struct mutex ring_mutex; +spinlock_t ring_lock;struct amdgpu_ring ring;struct amdgpu_irq_src irq; };drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +2
-2@@ -788,7 +788,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid)struct dma_fence *f;struct amdgpu_ring *ring = &adev->gfx.kiq.ring; -mutex_lock (&adev->gfx.kiq.ring_mutex); +spin_lock (&adev->gfx.kiq.ring_lock);amdgpu_ring_alloc (ring,12 );/* fence + invalidate_tlbs package*/ amdgpu_ring_write (ring,PACKET3 (PACKET3_INVALIDATE_TLBS ,0 )); amdgpu_ring_write(ring,@@ -796,7 +796,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) PACKET3_INVALIDATE_TLBS_PASID(pasid));amdgpu_fence_emit (ring, &f);amdgpu_ring_commit (ring); -mutex_unlock (&adev->gfx.kiq.ring_mutex); +spin_unlock (&adev->gfx.kiq.ring_lock); r =dma_fence_wait (f, false);if (r)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2
-2@@ -973,7 +973,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid)struct dma_fence *f;struct amdgpu_ring *ring = &adev->gfx.kiq.ring; -mutex_lock (&adev->gfx.kiq.ring_mutex); +spin_lock (&adev->gfx.kiq.ring_lock);amdgpu_ring_alloc (ring,12 );/* fence + invalidate_tlbs package*/ amdgpu_ring_write (ring,PACKET3 (PACKET3_INVALIDATE_TLBS ,0 )); amdgpu_ring_write(ring,@@ -983,7 +983,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) PACKET3_INVALIDATE_TLBS_FLUSH_TYPE(2));amdgpu_fence_emit (ring, &f);amdgpu_ring_commit (ring); -mutex_unlock (&adev->gfx.kiq.ring_mutex); +spin_unlock (&adev->gfx.kiq.ring_lock); r =dma_fence_wait (f, false);if (r)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-6@@ -109,10 +109,8 @@ uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg, {uint32_t ret; -if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev)) { -BUG_ON (in_interrupt ()); +if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))return amdgpu_virt_kiq_rreg (adev, reg); - }if ((reg *4 ) < adev->rmmio_size && !(acc_flags &AMDGPU_REGS_IDX )) ret =readl (((void __iomem *)adev->rmmio) + (reg *4 ));@@ -137,10 +135,8 @@ void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, adev->last_mm_index = v; } -if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev)) { -BUG_ON (in_interrupt ()); +if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))return amdgpu_virt_kiq_wreg (adev, reg, v); - }if ((reg *4 ) < adev->rmmio_size && !(acc_flags &AMDGPU_REGS_IDX ))writel (v, ((void __iomem *)adev->rmmio) + (reg *4 ));drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +38
-0@@ -169,6 +169,32 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct dma_fence **f) }/** +* amdgpu_fence_emit_polling - emit a fence on the requeste ring +* +* @ring: ring the fence is associated with +* @s: resulting sequence number +* +* Emits a fence command on the requested ring (all asics). +* Used For polling fence. +* Returns 0 on success, -ENOMEM on failure. +*/ +int amdgpu_fence_emit_polling (struct amdgpu_ring *ring,uint32_t *s) +{ +uint32_t seq; + +if (!s) +return -EINVAL ; + + seq = ++ring->fence_drv.sync_seq; +amdgpu_ring_emit_fence (ring, ring->fence_drv.gpu_addr, + seq,AMDGPU_FENCE_FLAG_INT ); + + *s = seq; + +return 0 ; +} + +/** * amdgpu_fence_schedule_fallback - schedule fallback check * * @ring: pointer to struct amdgpu_ring @@ -282,6 +308,30 @@ int amdgpu_fence_wait_empty(struct amdgpu_ring *ring) }/** +* amdgpu_fence_wait_polling - busy wait for givn sequence number +* +* @ring: ring index the fence is associated with +* @wait_seq: sequence number to wait +* @timeout: the timeout for waiting in usecs +* +* Wait for all fences on the requested ring to signal (all asics). +* Returns left time if no timeout, 0 or minus if timeout. +*/ +signed long amdgpu_fence_wait_polling (struct amdgpu_ring *ring, +uint32_t wait_seq, +signed long timeout)drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c int amdgpu_fence_wait_empty(struct amdgpu_ring *ring) · line 332
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +10
-0+{ +uint32_t seq; + +do { + seq =amdgpu_fence_read (ring); +udelay (5 ); + timeout -=5 ; + }while ((int32_t )(wait_seq - seq) >0 && timeout >0 ); + +return timeout;Might be a good idea to avoid returning a negative timeout here to avoid confusion with some error code. E.g. just "return timeout > 0 ? timeout : 0".
Apart from that the patch looks good to me and is Reviewed-by: Christian König <[email protected]>.
Regards,
Christian.Quoted 111 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +2
-0+} +/** * amdgpu_fence_count_emitted - get the count of emitted fences * * @ring: ring the fence is associated with drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1
-1@@ -185,7 +185,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev,struct amdgpu_kiq *kiq = &adev->gfx.kiq;int r =0 ; -mutex_init (&kiq->ring_mutex); +spin_lock_init (&kiq->ring_lock); r =amdgpu_wb_get (adev, &adev->virt.reg_val_offs);if (r)drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +4
-0@@ -89,8 +89,12 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,void amdgpu_fence_driver_suspend (struct amdgpu_device *adev);void amdgpu_fence_driver_resume (struct amdgpu_device *adev);int amdgpu_fence_emit (struct amdgpu_ring *ring,struct dma_fence **fence); +int amdgpu_fence_emit_polling (struct amdgpu_ring *ring,uint32_t *s);void amdgpu_fence_process (struct amdgpu_ring *ring);int amdgpu_fence_wait_empty (struct amdgpu_ring *ring); +signed long amdgpu_fence_wait_polling (struct amdgpu_ring *ring, +uint32_t wait_seq, +signed long timeout);unsigned amdgpu_fence_count_emitted (struct amdgpu_ring *ring);/* drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +13
-17@@ -22,7 +22,7 @@*/ #include "amdgpu.h" -#define MAX_KIQ_REG_WAIT 100000 +#define MAX_KIQ_REG_WAIT 100000000/* in usecs */ int amdgpu_allocate_static_csa (struct amdgpu_device *adev) {@@ -114,27 +114,24 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)uint32_t amdgpu_virt_kiq_rreg (struct amdgpu_device *adev,uint32_t reg) {signed long r; -uint32_t val; -struct dma_fence *f; +uint32_t val, seq;struct amdgpu_kiq *kiq = &adev->gfx.kiq;struct amdgpu_ring *ring = &kiq->ring;BUG_ON (!ring->funcs->emit_rreg); -mutex_lock (&kiq->ring_mutex); +spin_lock (&kiq->ring_lock);amdgpu_ring_alloc (ring,32 );amdgpu_ring_emit_rreg (ring, reg); -amdgpu_fence_emit (ring, &f); +amdgpu_fence_emit_polling (ring, &seq);amdgpu_ring_commit (ring); -mutex_unlock (&kiq->ring_mutex); +spin_unlock (&kiq->ring_lock); - r =dma_fence_wait_timeout (f, false,msecs_to_jiffies (MAX_KIQ_REG_WAIT )); -dma_fence_put (f); + r =amdgpu_fence_wait_polling (ring, seq,MAX_KIQ_REG_WAIT );if (r <1 ) { -DRM_ERROR ("wait for kiq fence error: %ld.\n" , r); +DRM_ERROR ("wait for kiq fence error: %ld\n" , r);return ~0 ; } - val = adev->wb.wb[adev->virt.reg_val_offs];return val;@@ -143,23 +140,22 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)void amdgpu_virt_kiq_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v) {signed long r; -struct dma_fence *f; +uint32_t seq;struct amdgpu_kiq *kiq = &adev->gfx.kiq;struct amdgpu_ring *ring = &kiq->ring;BUG_ON (!ring->funcs->emit_wreg); -mutex_lock (&kiq->ring_mutex); +spin_lock (&kiq->ring_lock);amdgpu_ring_alloc (ring,32 );amdgpu_ring_emit_wreg (ring, reg, v); -amdgpu_fence_emit (ring, &f); +amdgpu_fence_emit_polling (ring, &seq);amdgpu_ring_commit (ring); -mutex_unlock (&kiq->ring_mutex); +spin_unlock (&kiq->ring_lock); - r =dma_fence_wait_timeout (f, false,msecs_to_jiffies (MAX_KIQ_REG_WAIT )); + r =amdgpu_fence_wait_polling (ring, seq,MAX_KIQ_REG_WAIT );if (r <1 ) -DRM_ERROR ("wait for kiq fence error: %ld.\n" , r); -dma_fence_put (f); +DRM_ERROR ("wait for kiq fence error: %ld\n" , r); }
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) · line 161
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +0
-0/**
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx