drm/amdgpu: remove the VI hardware semaphore in ring sync

Signed-off-by: David Zhang <david1.zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 698ea6ce1185c8cd49c9b6fa9f18a1935f94ced5..70cc6bd48926fcd788bca78e0689aae8cecca911 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -3783,11 +3783,10 @@ static bool gfx_v8_0_ring_emit_semaphore(struct amdgpu_ring *ring,
        unsigned sel = emit_wait ? PACKET3_SEM_SEL_WAIT : PACKET3_SEM_SEL_SIGNAL;
 
        if (ring->adev->asic_type == CHIP_TOPAZ ||
-           ring->adev->asic_type == CHIP_TONGA) {
-               amdgpu_ring_write(ring, PACKET3(PACKET3_MEM_SEMAPHORE, 1));
-               amdgpu_ring_write(ring, lower_32_bits(addr));
-               amdgpu_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel);
-       } else {
+           ring->adev->asic_type == CHIP_TONGA)
+               /* we got a hw semaphore bug in VI TONGA, return false to switch back to sw fence wait */
+               return false;
+       else {
                amdgpu_ring_write(ring, PACKET3(PACKET3_MEM_SEMAPHORE, 2));
                amdgpu_ring_write(ring, lower_32_bits(addr));
                amdgpu_ring_write(ring, upper_32_bits(addr));