diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2018-04-01 14:59:44 -0400 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2018-04-05 15:34:58 -0400 |
| commit | 4598ad6a008b535d5b39e0b2727883818afbf571 (patch) | |
| tree | 7adaeb6662fbd8e8b3059b385f630afa3494cb33 /src/gallium/drivers/radeon | |
| parent | 426ef367f3a3710da022ee76a4f605aad88aea3f (diff) | |
radeonsi: make radeon_add_to_buffer_list_check_mem be gfx-only
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_cs.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/gallium/drivers/radeon/r600_cs.h b/src/gallium/drivers/radeon/r600_cs.h index c46fad6f6be..5cfe6abf7b3 100644 --- a/src/gallium/drivers/radeon/r600_cs.h +++ b/src/gallium/drivers/radeon/r600_cs.h @@ -95,20 +95,19 @@ static inline void radeon_add_to_buffer_list(struct r600_common_context *rctx, * a different constraint disallowing a context flush */ static inline void -radeon_add_to_buffer_list_check_mem(struct r600_common_context *rctx, - struct r600_ring *ring, - struct r600_resource *rbo, - enum radeon_bo_usage usage, - enum radeon_bo_priority priority, - bool check_mem) +radeon_add_to_gfx_buffer_list_check_mem(struct si_context *sctx, + struct r600_resource *rbo, + enum radeon_bo_usage usage, + enum radeon_bo_priority priority, + bool check_mem) { if (check_mem && - !radeon_cs_memory_below_limit(rctx->screen, ring->cs, - rctx->vram + rbo->vram_usage, - rctx->gtt + rbo->gart_usage)) - ring->flush(rctx, PIPE_FLUSH_ASYNC, NULL); + !radeon_cs_memory_below_limit(sctx->screen, sctx->b.gfx.cs, + sctx->b.vram + rbo->vram_usage, + sctx->b.gtt + rbo->gart_usage)) + si_flush_gfx_cs(&sctx->b, PIPE_FLUSH_ASYNC, NULL); - radeon_add_to_buffer_list(rctx, ring, rbo, usage, priority); + radeon_add_to_buffer_list(&sctx->b, &sctx->b.gfx, rbo, usage, priority); } static inline void radeon_set_config_reg_seq(struct radeon_winsys_cs *cs, unsigned reg, unsigned num) |