From 690a26fbe026e1c39736286fe5b20acb3e46edb1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 20 May 2020 12:59:57 -0700 Subject: [PATCH] cffdec: Fix decode on pixel 2 blob's COMPUTE_CHECKPOINT. dEQP-GLES31.functional.image_load_store.buffer.image_size.writeonly_7 produces: t7 opcode: CP_COMPUTE_CHECKPOINT (6e) (8 dwords) { ADDR_0_LO = 0x15000 } { ADDR_0_HI = 0x5 } 0x18 { ADDR_1_LEN = 3 } 0xf { ADDR_1_LO = 0x2e010 } { ADDR_1_HI = 0x5 } and it was asserting due to sizedwords==7. Without the assert, we were dereffing a len past the end of the packet. This len value we were loading is also suspiciously not the location of the ADDR_1_LEN field in the packet's XML. But then, the command stream at ADDR_1 was clearly 0xf long, and that puts ADDR_1_LEN at the spot we would expect compared to SET_RENDER_MODE's ADDR_1. --- cffdump/cffdec.c | 4 ++-- rnndb/adreno/adreno_pm4.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cffdump/cffdec.c b/cffdump/cffdec.c index 7e9722a95..880bdf371 100644 --- a/cffdump/cffdec.c +++ b/cffdump/cffdec.c @@ -2289,11 +2289,11 @@ cp_compute_checkpoint(uint32_t *dwords, uint32_t sizedwords, int level) assert(is_64b()); assert(options->gpu_id >= 500); - assert(sizedwords == 8); + assert(sizedwords == 7 || sizedwords == 8); addr = dwords[5]; addr |= ((uint64_t)dwords[6]) << 32; - len = dwords[7]; + len = dwords[4]; printl(3, "%saddr: 0x%016lx\n", levels[level], addr); printl(3, "%slen: 0x%x\n", levels[level], len); diff --git a/rnndb/adreno/adreno_pm4.xml b/rnndb/adreno/adreno_pm4.xml index 88e90e477..642766ca1 100644 --- a/rnndb/adreno/adreno_pm4.xml +++ b/rnndb/adreno/adreno_pm4.xml @@ -1276,10 +1276,10 @@ opcode: CP_LOAD_STATE4 (30) (4 dwords) - + + -