OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/radeon: use cs_check_space throughout

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2016-05-06 12:42:05 -05:00
parent 46ad3561be
commit d6211a61b0
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r300/r300_blit.c
View File

@@ -382,7 +382,7 @@ static void r300_clear(struct pipe_context* pipe,
r300_get_num_cs_end_dwords(r300); r300_get_num_cs_end_dwords(r300);
/* Reserve CS space. */ /* Reserve CS space. */
if (dwords > (r300->cs->max_dw - r300->cs->cdw)) { if (!r300->rws->cs_check_space(r300->cs, dwords)) {
r300_flush(&r300->context, RADEON_FLUSH_ASYNC, NULL); r300_flush(&r300->context, RADEON_FLUSH_ASYNC, NULL);
} }

2
src/gallium/drivers/r300/r300_render.c
View File

@@ -215,7 +215,7 @@ static boolean r300_reserve_cs_dwords(struct r300_context *r300,
cs_dwords += r300_get_num_cs_end_dwords(r300); cs_dwords += r300_get_num_cs_end_dwords(r300);
/* Reserve requested CS space. */ /* Reserve requested CS space. */
if (cs_dwords > (r300->cs->max_dw - r300->cs->cdw)) { if (!r300->rws->cs_check_space(r300->cs, cs_dwords)) {
r300_flush(&r300->context, RADEON_FLUSH_ASYNC, NULL); r300_flush(&r300->context, RADEON_FLUSH_ASYNC, NULL);
flushed = TRUE; flushed = TRUE;
} }

6
src/gallium/drivers/r600/r600_hw_context.c
View File

@@ -47,9 +47,7 @@ void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw,
ctx->b.gtt = 0; ctx->b.gtt = 0;
ctx->b.vram = 0; ctx->b.vram = 0;
/* The number of dwords we already used in the CS so far. */ /* Check available space in CS. */
num_dw += ctx->b.gfx.cs->cdw;
if (count_draw_in) { if (count_draw_in) {
uint64_t mask; uint64_t mask;
@@ -82,7 +80,7 @@ void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw,
num_dw += 10; num_dw += 10;
/* Flush if there's not enough space. */ /* Flush if there's not enough space. */
if (num_dw > ctx->b.gfx.cs->max_dw) { if (!ctx->b.ws->cs_check_space(ctx->b.gfx.cs, num_dw)) {
ctx->b.gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL); ctx->b.gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
} }
} }

2
src/gallium/drivers/radeon/r600_pipe_common.c
View File

@@ -168,7 +168,7 @@ void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
/* Flush if there's not enough space, or if the memory usage per IB /* Flush if there's not enough space, or if the memory usage per IB
* is too large. * is too large.
*/ */
if ((num_dw + ctx->dma.cs->cdw) > ctx->dma.cs->max_dw || if (!ctx->ws->cs_check_space(ctx->dma.cs, num_dw) ||
!ctx->ws->cs_memory_below_limit(ctx->dma.cs, vram, gtt)) { !ctx->ws->cs_memory_below_limit(ctx->dma.cs, vram, gtt)) {
ctx->dma.flush(ctx, RADEON_FLUSH_ASYNC, NULL); ctx->dma.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
assert((num_dw + ctx->dma.cs->cdw) <= ctx->dma.cs->max_dw); assert((num_dw + ctx->dma.cs->cdw) <= ctx->dma.cs->max_dw);

5
src/gallium/drivers/radeonsi/si_hw_context.c
View File

@@ -84,9 +84,8 @@ void si_need_cs_space(struct si_context *ctx)
/* If the CS is sufficiently large, don't count the space needed /* If the CS is sufficiently large, don't count the space needed
* and just flush if there is not enough space left. * and just flush if there is not enough space left.
*/ */
if (unlikely(cs->cdw > cs->max_dw - 2048 || if (!ctx->b.ws->cs_check_space(cs, 2048) ||
(ce_ib && ce_ib->max_dw - ce_ib->cdw < (ce_ib && !ctx->b.ws->cs_check_space(ce_ib, si_ce_needed_cs_space())))
si_ce_needed_cs_space())))
ctx->b.gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL); ctx->b.gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
} }