From 05af645a951fd985d0dbe3c22614e1dee8dfb3f0 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 30 Aug 2015 03:44:03 +0200 Subject: radeonsi: fix memory usage checking for big IBs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: 11.0 Reviewed-by: Alex Deucher Acked-by: Christian König --- src/gallium/drivers/radeonsi/si_hw_context.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index 110e3163021..563251ddd4b 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -33,14 +33,6 @@ void si_need_cs_space(struct si_context *ctx, unsigned num_dw, struct radeon_winsys_cs *cs = ctx->b.rings.gfx.cs; int i; - /* If the CS is sufficiently large, don't count the space needed - * and just flush if there is less than 8096 dwords left. */ - if (cs->max_dw >= 24 * 1024) { - if (cs->cdw > cs->max_dw - 8 * 1024) - ctx->b.rings.gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL); - return; - } - /* There are two memory usage counters in the winsys for all buffers * that have been added (cs_add_reloc) and two counters in the pipe * driver for those that haven't been added yet. @@ -54,6 +46,15 @@ void si_need_cs_space(struct si_context *ctx, unsigned num_dw, ctx->b.gtt = 0; ctx->b.vram = 0; + /* If the CS is sufficiently large, don't count the space needed + * and just flush if there is less than 8096 dwords left. + */ + if (cs->max_dw >= 24 * 1024) { + if (cs->cdw > cs->max_dw - 8 * 1024) + ctx->b.rings.gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL); + return; + } + /* The number of dwords we already used in the CS so far. */ num_dw += cs->cdw; -- cgit v1.2.3