From: David Zhang Date: Wed, 10 Jun 2015 18:28:56 +0000 (+0800) Subject: drm/amdgpu: remove the VI hardware semaphore in ring sync X-Git-Tag: v4.2-rc1~13^2~23^2~13 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=147dbfbc54e460682eba3494370ea33e9fd5e9b0;p=karo-tx-linux.git drm/amdgpu: remove the VI hardware semaphore in ring sync Signed-off-by: David Zhang Reviewed-by: Christian König --- diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 698ea6ce1185..70cc6bd48926 100644 --- 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));