Mesa (master): winsys/amdgpu: replace amdgpu_winsys_bo::initial_domain with pb_buffer::placement
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Nov 19 05:10:41 UTC 2020
Module: Mesa
Branch: master
Commit: bccb9a745745b2d7fbf89a900ecfeff4a391ee21
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bccb9a745745b2d7fbf89a900ecfeff4a391ee21
Author: Marek Olšák <marek.olsak at amd.com>
Date: Thu Nov 12 14:29:44 2020 -0500
winsys/amdgpu: replace amdgpu_winsys_bo::initial_domain with pb_buffer::placement
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7585>
---
src/gallium/auxiliary/pipebuffer/pb_buffer.h | 6 ++++++
src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 32 ++++++++++++++--------------
src/gallium/winsys/amdgpu/drm/amdgpu_bo.h | 1 -
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 8 +++----
4 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index f4992d40f31..acfd7f0c60d 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
@@ -119,6 +119,12 @@ struct pb_buffer
*/
unsigned usage;
+ /**
+ * For internal driver use. It's here so as not to waste space due to
+ * type alignment. (pahole)
+ */
+ unsigned placement;
+
/**
* Pointer to the virtual function table.
*
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
index 394f77d623f..fd95a5b0fdd 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
@@ -143,7 +143,7 @@ static bool amdgpu_bo_wait(struct pb_buffer *_buf, uint64_t timeout,
static enum radeon_bo_domain amdgpu_bo_get_initial_domain(
struct pb_buffer *buf)
{
- return ((struct amdgpu_winsys_bo*)buf)->initial_domain;
+ return ((struct amdgpu_winsys_bo*)buf)->base.placement;
}
static enum radeon_bo_flag amdgpu_bo_get_flags(
@@ -205,7 +205,7 @@ void amdgpu_bo_destroy(struct pb_buffer *_buf)
_mesa_hash_table_remove_key(ws->bo_export_table, bo->bo);
simple_mtx_unlock(&ws->bo_export_table_lock);
- if (bo->initial_domain & RADEON_DOMAIN_VRAM_GTT) {
+ if (bo->base.placement & RADEON_DOMAIN_VRAM_GTT) {
amdgpu_bo_va_op(bo->bo, 0, bo->base.size, bo->va, 0, AMDGPU_VA_OP_UNMAP);
amdgpu_va_range_free(bo->u.real.va_handle);
}
@@ -213,9 +213,9 @@ void amdgpu_bo_destroy(struct pb_buffer *_buf)
amdgpu_bo_remove_fences(bo);
- if (bo->initial_domain & RADEON_DOMAIN_VRAM)
+ if (bo->base.placement & RADEON_DOMAIN_VRAM)
ws->allocated_vram -= align64(bo->base.size, ws->info.gart_page_size);
- else if (bo->initial_domain & RADEON_DOMAIN_GTT)
+ else if (bo->base.placement & RADEON_DOMAIN_GTT)
ws->allocated_gtt -= align64(bo->base.size, ws->info.gart_page_size);
simple_mtx_destroy(&bo->lock);
@@ -258,9 +258,9 @@ static bool amdgpu_bo_do_map(struct amdgpu_winsys_bo *bo, void **cpu)
}
if (p_atomic_inc_return(&bo->u.real.map_count) == 1) {
- if (bo->initial_domain & RADEON_DOMAIN_VRAM)
+ if (bo->base.placement & RADEON_DOMAIN_VRAM)
bo->ws->mapped_vram += bo->base.size;
- else if (bo->initial_domain & RADEON_DOMAIN_GTT)
+ else if (bo->base.placement & RADEON_DOMAIN_GTT)
bo->ws->mapped_gtt += bo->base.size;
bo->ws->num_mapped_buffers++;
}
@@ -414,9 +414,9 @@ void amdgpu_bo_unmap(struct pb_buffer *buf)
assert(!real->cpu_ptr &&
"too many unmaps or forgot RADEON_MAP_TEMPORARY flag");
- if (real->initial_domain & RADEON_DOMAIN_VRAM)
+ if (real->base.placement & RADEON_DOMAIN_VRAM)
real->ws->mapped_vram -= real->base.size;
- else if (real->initial_domain & RADEON_DOMAIN_GTT)
+ else if (real->base.placement & RADEON_DOMAIN_GTT)
real->ws->mapped_gtt -= real->base.size;
real->ws->num_mapped_buffers--;
}
@@ -577,7 +577,7 @@ static struct amdgpu_winsys_bo *amdgpu_create_bo(struct amdgpu_winsys *ws,
bo->bo = buf_handle;
bo->va = va;
bo->u.real.va_handle = va_handle;
- bo->initial_domain = initial_domain;
+ bo->base.placement = initial_domain;
bo->base.usage = flags;
bo->unique_id = __sync_fetch_and_add(&ws->next_bo_unique_id, 1);
@@ -725,7 +725,7 @@ static struct pb_slab *amdgpu_bo_slab_alloc(void *priv, unsigned heap,
bo->base.vtbl = &amdgpu_winsys_bo_slab_vtbl;
bo->ws = ws;
bo->va = slab->buffer->va + i * entry_size;
- bo->initial_domain = domains;
+ bo->base.placement = domains;
bo->unique_id = base_id + i;
bo->u.slab.entry.slab = &slab->base;
bo->u.slab.entry.group_index = group_index;
@@ -889,7 +889,7 @@ sparse_backing_alloc(struct amdgpu_winsys_bo *bo, uint32_t *pstart_page, uint32_
size = MAX2(size, RADEON_SPARSE_PAGE_SIZE);
buf = amdgpu_bo_create(bo->ws, size, RADEON_SPARSE_PAGE_SIZE,
- bo->initial_domain,
+ bo->base.placement,
(bo->base.usage & ~RADEON_FLAG_SPARSE) | RADEON_FLAG_NO_SUBALLOC);
if (!buf) {
FREE(best_backing->chunks);
@@ -1067,7 +1067,7 @@ amdgpu_bo_sparse_create(struct amdgpu_winsys *ws, uint64_t size,
bo->base.size = size;
bo->base.vtbl = &amdgpu_winsys_bo_sparse_vtbl;
bo->ws = ws;
- bo->initial_domain = domain;
+ bo->base.placement = domain;
bo->unique_id = __sync_fetch_and_add(&ws->next_bo_unique_id, 1);
bo->base.usage = flags;
@@ -1485,14 +1485,14 @@ static struct pb_buffer *amdgpu_bo_from_handle(struct radeon_winsys *rws,
bo->ws = ws;
bo->va = va;
bo->u.real.va_handle = va_handle;
- bo->initial_domain = initial;
+ bo->base.placement = initial;
bo->base.usage = flags;
bo->unique_id = __sync_fetch_and_add(&ws->next_bo_unique_id, 1);
bo->is_shared = true;
- if (bo->initial_domain & RADEON_DOMAIN_VRAM)
+ if (bo->base.placement & RADEON_DOMAIN_VRAM)
ws->allocated_vram += align64(bo->base.size, ws->info.gart_page_size);
- else if (bo->initial_domain & RADEON_DOMAIN_GTT)
+ else if (bo->base.placement & RADEON_DOMAIN_GTT)
ws->allocated_gtt += align64(bo->base.size, ws->info.gart_page_size);
amdgpu_bo_export(bo->bo, amdgpu_bo_handle_type_kms, &bo->u.real.kms_handle);
@@ -1630,7 +1630,7 @@ static struct pb_buffer *amdgpu_bo_from_ptr(struct radeon_winsys *rws,
bo->cpu_ptr = pointer;
bo->va = va;
bo->u.real.va_handle = va_handle;
- bo->initial_domain = RADEON_DOMAIN_GTT;
+ bo->base.placement = RADEON_DOMAIN_GTT;
bo->unique_id = __sync_fetch_and_add(&ws->next_bo_unique_id, 1);
ws->allocated_gtt += aligned_size;
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h
index a85fb450f7b..9ad7214686f 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h
@@ -93,7 +93,6 @@ struct amdgpu_winsys_bo {
bool is_user_ptr;
uint32_t unique_id;
uint64_t va;
- enum radeon_bo_domain initial_domain;
/* how many command streams is this bo referenced in? */
int num_cs_references;
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
index 184acd49600..e7e76cd315c 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
@@ -505,9 +505,9 @@ amdgpu_lookup_or_add_real_buffer(struct amdgpu_cs *acs, struct amdgpu_winsys_bo
hash = bo->unique_id & (ARRAY_SIZE(cs->buffer_indices_hashlist)-1);
cs->buffer_indices_hashlist[hash] = idx;
- if (bo->initial_domain & RADEON_DOMAIN_VRAM)
+ if (bo->base.placement & RADEON_DOMAIN_VRAM)
acs->main.base.used_vram += bo->base.size;
- else if (bo->initial_domain & RADEON_DOMAIN_GTT)
+ else if (bo->base.placement & RADEON_DOMAIN_GTT)
acs->main.base.used_gart += bo->base.size;
return idx;
@@ -608,9 +608,9 @@ static int amdgpu_lookup_or_add_sparse_buffer(struct amdgpu_cs *acs,
simple_mtx_lock(&bo->lock);
list_for_each_entry(struct amdgpu_sparse_backing, backing, &bo->u.sparse.backing, list) {
- if (bo->initial_domain & RADEON_DOMAIN_VRAM)
+ if (bo->base.placement & RADEON_DOMAIN_VRAM)
acs->main.base.used_vram += backing->bo->base.size;
- else if (bo->initial_domain & RADEON_DOMAIN_GTT)
+ else if (bo->base.placement & RADEON_DOMAIN_GTT)
acs->main.base.used_gart += backing->bo->base.size;
}
More information about the mesa-commit
mailing list