From: Tom Stellard <thomas.stellard@amd.com>
Date: Tue, 27 Aug 2013 00:55:49 +0000 (-0700)
Subject: r600g/compute: Don't flush the cs in pipe_context::launch_grid()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0435ebb07d01a77ca0d98967a002898811a5206;p=mesa.git

r600g/compute: Don't flush the cs in pipe_context::launch_grid()

This is the state tracker's responsibility.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index fbbc4fde8db..076c09cce39 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -473,6 +473,7 @@ static void compute_emit_cs(struct r600_context *ctx, const uint *block_layout,
 		      R600_CONTEXT_INV_VERTEX_CACHE |
 	              R600_CONTEXT_INV_TEX_CACHE;
 	r600_flush_emit(ctx);
+	ctx->b.flags = 0;
 
 #if 0
 	COMPUTE_DBG(ctx->screen, "cdw: %i\n", cs->cdw);
@@ -481,16 +482,6 @@ static void compute_emit_cs(struct r600_context *ctx, const uint *block_layout,
 	}
 #endif
 
-	flush_flags = RADEON_FLUSH_ASYNC | RADEON_FLUSH_COMPUTE;
-	if (ctx->keep_tiling_flags) {
-		flush_flags |= RADEON_FLUSH_KEEP_TILING_FLAGS;
-	}
-
-	ctx->b.ws->cs_flush(ctx->b.rings.gfx.cs, flush_flags, ctx->screen->cs_count++);
-
-	ctx->b.flags = 0;
-
-	COMPUTE_DBG(ctx->screen, "shader started\n");
 }