fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-19 23:10:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris,zink,winsys/amdgpu: remove unused/redundant slab->entry_size

Browse source 
slab->base has the same field.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26643>
This commit is contained in:
Marek Olšák 2023-12-08 23:45:04 -05:00 • committed by Marge Bot
parent 9431c33899
commit b3c64638b4
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/iris/iris_bufmgr.c
View file

@ -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;

4
src/gallium/drivers/zink/zink_bo.c
View file

@ -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;

7
src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
View file

@ -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);

1
src/gallium/winsys/amdgpu/drm/amdgpu_bo.h
View file

@ -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;
};