diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-07-29 15:48:18 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-08-06 13:56:14 +0200 |
| commit | f4b977bf3dba2b68ebda5b2c0823e4cc6d80192b (patch) | |
| tree | d1fd493e497c7ff7ad629483a2b9ea6b2ec236ab /src/gallium/drivers/radeon/r600_pipe_common.c | |
| parent | 62d41162bbde86b181afd9e550d49b918fa02831 (diff) | |
| download | external_mesa3d-f4b977bf3dba2b68ebda5b2c0823e4cc6d80192b.zip external_mesa3d-f4b977bf3dba2b68ebda5b2c0823e4cc6d80192b.tar.gz external_mesa3d-f4b977bf3dba2b68ebda5b2c0823e4cc6d80192b.tar.bz2 | |
gallium/radeon: add r600_resource::vram_usage and gart_usage
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_pipe_common.c')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 6f4fc98..8fae74d 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -144,16 +144,12 @@ void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw, uint64_t vram = 0, gtt = 0; if (dst) { - if (dst->domains & RADEON_DOMAIN_VRAM) - vram += dst->buf->size; - else if (dst->domains & RADEON_DOMAIN_GTT) - gtt += dst->buf->size; + vram += dst->vram_usage; + gtt += dst->gart_usage; } if (src) { - if (src->domains & RADEON_DOMAIN_VRAM) - vram += src->buf->size; - else if (src->domains & RADEON_DOMAIN_GTT) - gtt += src->buf->size; + vram += src->vram_usage; + gtt += src->gart_usage; } /* Flush the GFX IB if DMA depends on it. */ @@ -530,10 +526,8 @@ void r600_context_add_resource_size(struct pipe_context *ctx, struct pipe_resour * In practice this gave very good estimate (+/- 10% of the target * memory limit). */ - if (rr->domains & RADEON_DOMAIN_VRAM) - rctx->vram += rr->buf->size; - else if (rr->domains & RADEON_DOMAIN_GTT) - rctx->gtt += rr->buf->size; + rctx->vram += rr->vram_usage; + rctx->gtt += rr->gart_usage; } /* |