OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: fix heap/memory type selection

Browse Source 
the memory type index still needs to be used for suballocation over the
heap since that's the actual type of allocation being used

Fixes: f6d3a5755f ("zink: zink_heap isn't 1-to-1 with memoryTypeIndex")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20912>
This commit is contained in:
Mike Blumenkrantz
2023-01-25 11:10:44 -05:00
committed by Marge Bot
parent 07809c4527
commit ccde3e02ba
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/drivers/zink/zink_bo.c
View File

@@ -614,12 +614,12 @@ zink_bo_create(struct zink_screen *screen, uint64_t size, unsigned alignment, en
unsigned vk_heap_idx = screen->info.mem_props.memoryTypes[mem_type_idx].heapIndex;
reclaim_all = screen->info.mem_props.memoryHeaps[vk_heap_idx].size <= low_bound;
}
entry = pb_slab_alloc_reclaimed(slabs, alloc_size, heap, reclaim_all);
entry = pb_slab_alloc_reclaimed(slabs, alloc_size, mem_type_idx, reclaim_all);
if (!entry) {
/* Clean up buffer managers and try again. */
clean_up_buffer_managers(screen);
entry = pb_slab_alloc_reclaimed(slabs, alloc_size, heap, true);
entry = pb_slab_alloc_reclaimed(slabs, alloc_size, mem_type_idx, true);
}
if (!entry)
return NULL;
@@ -1161,7 +1161,7 @@ static const struct pb_vtbl bo_slab_vtbl = {
};
static struct pb_slab *
bo_slab_alloc(void *priv, unsigned heap, unsigned entry_size, unsigned group_index, bool encrypted)
bo_slab_alloc(void *priv, unsigned mem_type_idx, unsigned entry_size, unsigned group_index, bool encrypted)
{
struct zink_screen *screen = priv;
uint32_t base_id;
@@ -1203,8 +1203,8 @@ bo_slab_alloc(void *priv, unsigned heap, unsigned entry_size, unsigned group_ind
}
assert(slab_size != 0);
slab->buffer = zink_bo(zink_bo_create(screen, slab_size, slab_size, heap,
0, screen->heap_map[heap][0], NULL));
slab->buffer = zink_bo(zink_bo_create(screen, slab_size, slab_size, zink_heap_from_domain_flags(screen->info.mem_props.memoryTypes[mem_type_idx].propertyFlags, 0),
0, mem_type_idx, NULL));
if (!slab->buffer)
goto fail;
@@ -1259,9 +1259,9 @@ fail:
}
static struct pb_slab *
bo_slab_alloc_normal(void *priv, unsigned heap, unsigned entry_size, unsigned group_index)
bo_slab_alloc_normal(void *priv, unsigned mem_type_idx, unsigned entry_size, unsigned group_index)
{
return bo_slab_alloc(priv, heap, entry_size, group_index, false);
return bo_slab_alloc(priv, mem_type_idx, entry_size, group_index, false);
}
bool