diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-09-04 14:21:41 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-09-07 11:13:13 +0200 |
| commit | 53d74e055e3596a05b9a306ea867dac0d4591f95 (patch) | |
| tree | 81933bf7b5b1d63fc98d51a1f3d57ba591625e54 /src/gallium/winsys | |
| parent | 8c8874eafbe5f7cbb5d413ae1be660c9f001ced5 (diff) | |
| download | external_mesa3d-53d74e055e3596a05b9a306ea867dac0d4591f95.zip external_mesa3d-53d74e055e3596a05b9a306ea867dac0d4591f95.tar.gz external_mesa3d-53d74e055e3596a05b9a306ea867dac0d4591f95.tar.bz2 | |
gallium/radeon/winsyses: fix counting mapped memory
Not all buffers are unmapped explicitly.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/winsys')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 8 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index a4bc474..32df0be 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -151,6 +151,14 @@ void amdgpu_bo_destroy(struct pb_buffer *_buf) bo->ws->allocated_vram -= align64(bo->base.size, bo->ws->info.gart_page_size); else if (bo->initial_domain & RADEON_DOMAIN_GTT) bo->ws->allocated_gtt -= align64(bo->base.size, bo->ws->info.gart_page_size); + + if (bo->map_count >= 1) { + if (bo->initial_domain & RADEON_DOMAIN_VRAM) + bo->ws->mapped_vram -= bo->base.size; + else + bo->ws->mapped_gtt -= bo->base.size; + } + FREE(bo); } diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index 56aab48..5db2061 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -316,6 +316,14 @@ void radeon_bo_destroy(struct pb_buffer *_buf) rws->allocated_vram -= align(bo->base.size, rws->info.gart_page_size); else if (bo->initial_domain & RADEON_DOMAIN_GTT) rws->allocated_gtt -= align(bo->base.size, rws->info.gart_page_size); + + if (bo->map_count >= 1) { + if (bo->initial_domain & RADEON_DOMAIN_VRAM) + bo->rws->mapped_vram -= bo->base.size; + else + bo->rws->mapped_gtt -= bo->base.size; + } + FREE(bo); } |