From b3c64638b4e34d014bc1bc9abd2517bdc9f1405a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 8 Dec 2023 23:45:04 -0500 Subject: [PATCH] iris,zink,winsys/amdgpu: remove unused/redundant slab->entry_size slab->base has the same field. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/iris/iris_bufmgr.c | 3 --- src/gallium/drivers/zink/zink_bo.c | 4 +--- src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 7 +++---- src/gallium/winsys/amdgpu/drm/amdgpu_bo.h | 1 - 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index 158ed8ff3fd..088f34f1e28 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -179,8 +179,6 @@ struct iris_memregion { struct iris_slab { struct pb_slab base; - unsigned entry_size; - /** The BO representing the entire slab */ struct iris_bo *bo; @@ -795,7 +793,6 @@ iris_slab_alloc(void *priv, slab->base.num_free = slab->base.num_entries; slab->base.group_index = group_index; slab->base.entry_size = entry_size; - slab->entry_size = entry_size; slab->entries = calloc(slab->base.num_entries, sizeof(*slab->entries)); if (!slab->entries) goto fail_bo; diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c index eedfa2c9002..65b37ce3801 100644 --- a/src/gallium/drivers/zink/zink_bo.c +++ b/src/gallium/drivers/zink/zink_bo.c @@ -69,7 +69,6 @@ struct zink_sparse_commitment { struct zink_slab { struct pb_slab base; - unsigned entry_size; struct zink_bo *buffer; struct zink_bo *entries; }; @@ -174,7 +173,7 @@ bo_slab_free(struct zink_screen *screen, struct pb_slab *pslab) struct zink_slab *slab = zink_slab(pslab); ASSERTED unsigned slab_size = slab->buffer->base.size; - assert(slab->base.num_entries * slab->entry_size <= slab_size); + assert(slab->base.num_entries * slab->base.entry_size <= slab_size); FREE(slab->entries); zink_bo_unref(screen, slab->buffer); FREE(slab); @@ -1244,7 +1243,6 @@ bo_slab_alloc(void *priv, unsigned mem_type_idx, unsigned entry_size, unsigned g slab->base.num_free = slab->base.num_entries; slab->base.group_index = group_index; slab->base.entry_size = entry_size; - slab->entry_size = entry_size; slab->entries = CALLOC(slab->base.num_entries, sizeof(*slab->entries)); if (!slab->entries) goto fail_buffer; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index 7807980f154..e7412c32152 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -746,7 +746,6 @@ struct pb_slab *amdgpu_bo_slab_alloc(void *priv, unsigned heap, unsigned entry_s slab->base.num_free = slab->base.num_entries; slab->base.group_index = group_index; slab->base.entry_size = entry_size; - slab->entry_size = entry_size; slab->entries = CALLOC(slab->base.num_entries, sizeof(*slab->entries)); if (!slab->entries) goto fail_buffer; @@ -799,11 +798,11 @@ void amdgpu_bo_slab_free(struct amdgpu_winsys *ws, struct pb_slab *pslab) struct amdgpu_slab *slab = amdgpu_slab(pslab); unsigned slab_size = slab->buffer->base.size; - assert(slab->base.num_entries * slab->entry_size <= slab_size); + assert(slab->base.num_entries * slab->base.entry_size <= slab_size); if (slab->buffer->base.placement & RADEON_DOMAIN_VRAM) - ws->slab_wasted_vram -= slab_size - slab->base.num_entries * slab->entry_size; + ws->slab_wasted_vram -= slab_size - slab->base.num_entries * slab->base.entry_size; else - ws->slab_wasted_gtt -= slab_size - slab->base.num_entries * slab->entry_size; + ws->slab_wasted_gtt -= slab_size - slab->base.num_entries * slab->base.entry_size; for (unsigned i = 0; i < slab->base.num_entries; ++i) amdgpu_bo_remove_fences(&slab->entries[i].b); diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h index 5b23b89b9d3..e0959e03da0 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h @@ -126,7 +126,6 @@ struct amdgpu_bo_slab { struct amdgpu_slab { struct pb_slab base; - unsigned entry_size; struct amdgpu_winsys_bo *buffer; struct amdgpu_bo_slab *entries; };