drm/amdgpu: invalidate mmhub semphore workaround in gmc9/gmc10
Subsystems (2)
PATCH 2/2 drm/amdgpu: invalidate mmhub semphore workaround in gmc9/gmc10
From: changzhu <[email protected]>
It may lose gpuvm invalidate acknowldege state across power-gating off cycle. To avoid this issue in gmc9/gmc10 invalidation, add semaphore acquire before invalidation and semaphore release after invalidation.
After adding semaphore acquire before invalidation, the semaphore register become read-only if another process try to acquire semaphore. Then it will not be able to release this semaphore. Then it may cause deadlock problem. If this deadlock problem happens, it needs a semaphore firmware fix.
Change-Id I9942a2f451265c1f1038ccfe2f70042c7c8118af
Signed-off-by changzhu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 54 ++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 54 ++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/soc15.h | 4 +- 3 files changed, 110 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +54 -0
@@ -234,6 +234,27 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,const unsigned eng =17 ;unsigned int i; +spin_lock (&adev->gmc.invalidate_lock); +/* +* It may lose gpuvm invalidate acknowldege state across power-gating +* off cycle, add semaphore acquire before invalidation and semaphore +* release after invalidation to avoid entering power gated state +* to WA the Issue +*/ +if (vmhub ==AMDGPU_MMHUB_0 || + vmhub ==AMDGPU_MMHUB_1 ) { +for (i =0 ; i < adev->usec_timeout; i++) { +/* a read return value of 1 means semaphore acuqire */ + tmp =RREG32_NO_KIQ (hub->vm_inv_eng0_sem + eng); +if (tmp &0x1 ) +break ; +udelay (1 ); + } + +if (i >= adev->usec_timeout) +DRM_ERROR ("Timeout waiting for sem acquire in VM flush!\n" ); + } +WREG32_NO_KIQ (hub->vm_inv_eng0_req + eng, tmp);/*
@@ -253,6 +274,16 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,udelay (1 ); } +/* +* add semaphore release after invalidation, +* write with 0 means semaphore release +*/ +if (vmhub ==AMDGPU_MMHUB_0 || + vmhub ==AMDGPU_MMHUB_1 ) +WREG32_NO_KIQ (hub->vm_inv_eng0_sem + eng,0 ); + +spin_unlock (&adev->gmc.invalidate_lock); +if (i < adev->usec_timeout)return ;
@@ -338,6 +369,21 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,uint32_t req =gmc_v10_0_get_invalidate_req (vmid,0 );unsigned eng = ring->vm_inv_eng; +/* +* It may lose gpuvm invalidate acknowldege state across power-gating +* off cycle, add semaphore acquire before invalidation and semaphore +* release after invalidation to avoid entering power gated state +* to WA the Issue +*/ + +/* a read return value of 1 means semaphore acuqire */ +if (ring->funcs->vmhub ==AMDGPU_MMHUB_0 || + ring->funcs->vmhub ==AMDGPU_MMHUB_1 ) { +amdgpu_ring_emit_reg_wait (ring, + hub->vm_inv_eng0_sem + eng,0x1 ,0x1 ); +DRM_WARN_ONCE ("Adding semaphore may cause deadlock and it needs firmware fix\n" ); + } +amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_lo32 + (2 * vmid),lower_32_bits (pd_addr));
@@ -348,6 +394,14 @@ static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring, hub->vm_inv_eng0_ack + eng, req, 1 << vmid); +/* +* add semaphore release after invalidation, +* write with 0 means semaphore release +*/ +if (ring->funcs->vmhub ==AMDGPU_MMHUB_0 || + ring->funcs->vmhub ==AMDGPU_MMHUB_1 ) +amdgpu_ring_emit_wreg (ring, hub->vm_inv_eng0_sem + eng,0 ); +return pd_addr; }
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +54 -0
79 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/soc15.h +2 -2
@@ -28,8 +28,8 @@#include "nbio_v7_0.h" #include "nbio_v7_4.h" -#define SOC15_FLUSH_GPU_TLB_NUM_WREG 4 -#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 1 +#define SOC15_FLUSH_GPU_TLB_NUM_WREG 6 +#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 3extern const struct amd_ip_funcs soc15_common_ip_funcs;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx