From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 29 Dec 2016 18:00:43 +0000 (+0100)
Subject: radeonsi: also wait for SDMA in the clear_buffer CPU fallback
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=067a3237b955cc2a789caf34ad0d8afa54d9cac3;p=mesa.git

radeonsi: also wait for SDMA in the clear_buffer CPU fallback

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c
index b25598cde6b..722ac4d2c23 100644
--- a/src/gallium/drivers/radeonsi/si_cp_dma.c
+++ b/src/gallium/drivers/radeonsi/si_cp_dma.c
@@ -184,9 +184,8 @@ static void si_clear_buffer(struct pipe_context *ctx, struct pipe_resource *dst,
 
 	/* Fallback for unaligned clears. */
 	if (offset % 4 != 0 || size % 4 != 0) {
-		uint8_t *map = sctx->b.ws->buffer_map(r600_resource(dst)->buf,
-						      sctx->b.gfx.cs,
-						      PIPE_TRANSFER_WRITE);
+		uint8_t *map = r600_buffer_map_sync_with_rings(&sctx->b, rdst,
+							       PIPE_TRANSFER_WRITE);
 		map += offset;
 		for (uint64_t i = 0; i < size; i++) {
 			unsigned byte_within_dword = (offset + i) % 4;