Mesa (master): r600g: don't call buffer_wait in buffer_mmap_sync_with_rings

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 862f69fbe1e54e0e9a3c439450a14f0319648b60
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=862f69fbe1e54e0e9a3c439450a14f0319648b60

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Jun 30 14:57:17 2013 +0200

r600g: don't call buffer_wait in buffer_mmap_sync_with_rings

The winsys should do this, because it measures how much time we spend
in buffer_map doing synchronization, which can be viewed with the gallium
HUD.

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

---

 src/gallium/drivers/r600/r600_pipe.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index c9f4607..8b67e85 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -292,10 +292,9 @@ void *r600_buffer_mmap_sync_with_rings(struct r600_context *ctx,
 			ctx->ws->cs_sync_flush(ctx->rings.dma.cs);
 		}
 	}
-	ctx->ws->buffer_wait(resource->buf, rusage);
 
 	/* at this point everything is synchronized */
-	return ctx->ws->buffer_map(resource->cs_buf, NULL, usage | PIPE_TRANSFER_UNSYNCHRONIZED);
+	return ctx->ws->buffer_map(resource->cs_buf, NULL, usage);
 }
 
 static void r600_flush_from_winsys(void *ctx, unsigned flags)