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

pan/decode: Use tag bits for resource entry count

Browse Source 
Fixes crashes when decoding the blob, which sometimes uses fewer than
9 entries.

Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17371>
This commit is contained in:
Icecream95
2022-07-07 12:26:03 +12:00
committed by Marge Bot
parent f7da4eade4
commit e05889c8c9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/panfrost/lib/genxml/decode.c
View File

@@ -1205,11 +1205,10 @@ pandecode_resources(mali_ptr addr, unsigned size)
static void
pandecode_resource_tables(mali_ptr addr, const char *label)
{
fprintf(pandecode_dump_stream, "Tag %x\n", (int) (addr & 0xF));
addr = addr & ~0xF;
unsigned count = addr & 0x3F;
addr = addr & ~0x3F;
struct pandecode_mapped_memory *mem = pandecode_find_mapped_gpu_mem_containing(addr);
unsigned count = 9; // TODO: what is the actual count? at least 5.
const uint8_t *cl = pandecode_fetch_gpu_mem(mem, addr, MALI_RESOURCE_LENGTH * count);
for (unsigned i = 0; i < count; ++i) {