summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeon/r600_pipe_common.c
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2015-11-07 13:31:03 +0100
committerMarek Olšák <marek.olsak@amd.com>2015-11-13 19:54:41 +0100
commit81d412e02ce7db644774202b175f1f24b1f262c7 (patch)
tree6842c5b03a88f0d7abbd5a939e80b169584df57c /src/gallium/drivers/radeon/r600_pipe_common.c
parentc6012a6650c894e57dba51f8e336f134aad13d61 (diff)
downloadexternal_mesa3d-81d412e02ce7db644774202b175f1f24b1f262c7.zip
external_mesa3d-81d412e02ce7db644774202b175f1f24b1f262c7.tar.gz
external_mesa3d-81d412e02ce7db644774202b175f1f24b1f262c7.tar.bz2
gallium/radeon: move GFX/DMA flushing from add_to_buffer_list to need_cs_space
need_cs_space isn't invoked so often and is called before all commands too. This is a lot cleaner. The code in radeon_add_to_buffer_list always seemed dodgy to me. Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_pipe_common.c')
-rw-r--r--src/gallium/drivers/radeon/r600_pipe_common.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 79e624e..e7179dc 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -117,6 +117,10 @@ void r600_draw_rectangle(struct blitter_context *blitter,
void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw)
{
+ /* Flush the GFX IB if it's not empty. */
+ if (ctx->rings.gfx.cs->cdw > ctx->initial_gfx_cs_size)
+ ctx->rings.gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
+
/* Flush if there's not enough space. */
if ((num_dw + ctx->rings.dma.cs->cdw) > ctx->rings.dma.cs->max_dw) {
ctx->rings.dma.flush(ctx, RADEON_FLUSH_ASYNC, NULL);