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

anv: Account for the header in anv_state_stream_alloc

Browse Source 
If we have an allocation that's exactly the block size, we end up
computing a new block size to allocate that's exactly the block size,
add in the header, and then assert fail.  When computing the block size,
we need to account for the header.

Fixes: 955127db93 "anv/allocator: Add support for large stream..."
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4336>
This commit is contained in:
Jason Ekstrand
2020-03-26 12:22:48 -05:00
committed by Marge Bot
parent 6e672074dd
commit 63bec07e14
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/vulkan/anv_allocator.c
View File

@@ -1226,9 +1226,10 @@ anv_state_stream_alloc(struct anv_state_stream *stream,
uint32_t offset = align_u32(stream->next, alignment);
if (offset + size > stream->block.alloc_size) {
uint32_t min_block_size = size + sizeof(struct anv_state_stream_block);
uint32_t block_size = stream->block_size;
if (block_size < size)
block_size = round_to_power_of_two(size);
if (block_size < min_block_size)
block_size = round_to_power_of_two(min_block_size);
stream->block = anv_state_pool_alloc_no_vg(stream->state_pool,
block_size, PAGE_SIZE);