Commit f8bc9037 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gmc9: use amdgpu_ring_emit_reg_write_reg_wait in gpu tlb flush 



Use amdgpu_ring_emit_reg_write_reg_wait.  On engines that support it,
it provides a write and wait in a single packet which avoids a missed
ack if a world switch happens between the request and waiting for the
ack.

Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f58b85e3

drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -385,11 +385,9 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring, 
	amdgpu_ring_emit_wreg(ring, hub->ctx0_ptb_addr_hi32 + (2 * vmid),

	amdgpu_ring_emit_wreg(ring, hub->ctx0_ptb_addr_hi32 + (2 * vmid),

			      upper_32_bits(pd_addr));

			      upper_32_bits(pd_addr));





	amdgpu_ring_emit_wreg(ring, hub->vm_inv_eng0_req + eng, req);

	amdgpu_ring_emit_reg_write_reg_wait(ring, hub->vm_inv_eng0_req + eng,



					    hub->vm_inv_eng0_ack + eng,

	/* wait for the invalidate to complete */

					    req, 1 << vmid);

	amdgpu_ring_emit_reg_wait(ring, hub->vm_inv_eng0_ack + eng,

				  1 << vmid, 1 << vmid);





	return pd_addr;

	return pd_addr;

}

}