diff options
| author | Marek Olšák <[email protected]> | 2016-04-22 10:16:14 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-04-28 12:46:47 +0200 |
| commit | 7d49b459b64e8cad2210c2ffc409b4efe6ea2214 (patch) | |
| tree | b24223419872724c2c3a7dfc9131c62059f46ac3 /src/gallium | |
| parent | db07b46f2cb89d96a17a28a0453a236451b560c7 (diff) | |
radeonsi: remove flushes at the beginning and end of IBs done by the kernel
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_hw_context.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index 5ab20d8e0d9..7fc58a60453 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -114,12 +114,13 @@ void si_context_gfx_flush(void *context, unsigned flags, r600_preflush_suspend_features(&ctx->b); - ctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_FRAMEBUFFER | - SI_CONTEXT_INV_VMEM_L1 | - SI_CONTEXT_INV_GLOBAL_L2 | - SI_CONTEXT_CS_PARTIAL_FLUSH | - /* this is probably not needed anymore */ + ctx->b.flags |= SI_CONTEXT_CS_PARTIAL_FLUSH | SI_CONTEXT_PS_PARTIAL_FLUSH; + /* The kernel doesn't flush TC for VI correctly (need TC_WB_ACTION_ENA). */ + if (ctx->b.chip_class == VI) + ctx->b.flags |= SI_CONTEXT_INV_GLOBAL_L2 | + SI_CONTEXT_INV_VMEM_L1; + si_emit_cache_flush(ctx, NULL); /* force to keep tiling flags */ @@ -184,13 +185,12 @@ void si_begin_new_cs(struct si_context *ctx) if (ctx->trace_buf) si_trace_emit(ctx); - /* Flush read caches at the beginning of CS. */ - ctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_FRAMEBUFFER | - SI_CONTEXT_INV_VMEM_L1 | - SI_CONTEXT_INV_GLOBAL_L2 | - SI_CONTEXT_INV_SMEM_L1 | - SI_CONTEXT_INV_ICACHE | - R600_CONTEXT_START_PIPELINE_STATS; + /* Flush read caches at the beginning of CS not flushed by the kernel. */ + if (ctx->b.chip_class >= CIK) + ctx->b.flags |= SI_CONTEXT_INV_SMEM_L1 | + SI_CONTEXT_INV_ICACHE; + + ctx->b.flags |= R600_CONTEXT_START_PIPELINE_STATS; /* set all valid group as dirty so they get reemited on * next draw command |