diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-07-29 21:41:23 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-08-06 13:56:14 +0200 |
| commit | 076db67217741aa820feadccc66067516d4cf4ca (patch) | |
| tree | c74917d89ffe1048a3fde895b40e75939199e566 /src/gallium/drivers/radeon | |
| parent | 9646ae77992f895b481984c9f8861cc64501a4eb (diff) | |
| download | external_mesa3d-076db67217741aa820feadccc66067516d4cf4ca.zip external_mesa3d-076db67217741aa820feadccc66067516d4cf4ca.tar.gz external_mesa3d-076db67217741aa820feadccc66067516d4cf4ca.tar.bz2 | |
gallium/radeon: inline radeon_winsys::query_memory_usage
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_winsys.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 8fae74d..faa7390 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -203,7 +203,7 @@ void r600_dma_emit_wait_idle(struct r600_common_context *rctx) * It improves texture upload performance by keeping the DMA * engine busy while uploads are being submitted. */ - if (rctx->ws->cs_query_memory_usage(rctx->dma.cs) > 64 * 1024 * 1024) { + if (cs->used_vram + cs->used_gart > 64 * 1024 * 1024) { rctx->dma.flush(rctx, RADEON_FLUSH_ASYNC, NULL); return; } diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index e6f5a89..2dd4a39 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -718,8 +718,6 @@ struct radeon_winsys { bool (*cs_memory_below_limit)(struct radeon_winsys_cs *cs, uint64_t vram, uint64_t gtt); - uint64_t (*cs_query_memory_usage)(struct radeon_winsys_cs *cs); - /** * Return the buffer list. * |