summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom St Denis <tom.stdenis@amd.com>2019-02-14 10:22:45 -0500
committerTom St Denis <tom.stdenis@amd.com>2019-02-14 10:22:45 -0500
commit6d07f4adbbab07058d976ac7a91dcd4c06f118d0 (patch)
tree40c2ba055643c1b2e4065f6a50aef8466296e8d2
parenta4ddf619c12107937f60a9100ae9d251b8c12af1 (diff)
fix MEMSPACE decoding for WAIT_REG_MEM PM4 opcode
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
-rw-r--r--src/lib/ring_decode.c2
-rw-r--r--src/lib/umr_pm4_decode_opcodes.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ring_decode.c b/src/lib/ring_decode.c
index 63273cc..5ff9ab0 100644
--- a/src/lib/ring_decode.c
+++ b/src/lib/ring_decode.c
@@ -655,7 +655,7 @@ static void print_decode_pm4_pkt3(struct umr_asic *asic, struct umr_ring_decoder
switch(decoder->pm4.cur_word) {
case 0: printf("ENGINE:%s%s%s, MEMSPACE:%s%s%s, FUNC:[%s%s%s]",
BLUE, BITS(ib, 8, 9) ? "PFP" : "ME", RST,
- BLUE, BITS(ib, 4, 5) ? "REG" : "MEM", RST,
+ BLUE, BITS(ib, 4, 5) ? "MEM" : "REG", RST,
BLUE, op_3c_functions[BITS(ib, 0, 4)], RST);
break;
case 1: printf("POLL_ADDRESS_LO: %s0x%08lx%s, SWAP: %s%lu%s",
diff --git a/src/lib/umr_pm4_decode_opcodes.c b/src/lib/umr_pm4_decode_opcodes.c
index 8cb3ffe..cda4152 100644
--- a/src/lib/umr_pm4_decode_opcodes.c
+++ b/src/lib/umr_pm4_decode_opcodes.c
@@ -388,7 +388,7 @@ static void decode_pkt3(struct umr_asic *asic, struct umr_pm4_stream_decode_ui *
break;
case 0x3C: // WAIT_REG_MEM
ui->add_field(ui, ib_addr + 4, ib_vmid, "ENGINE", 0, BITS(stream->words[0], 8, 9) ? "PFP" : "ME", 0);
- ui->add_field(ui, ib_addr + 4, ib_vmid, "MEMSPACE", 0, BITS(stream->words[0], 4, 5) ? "REG" : "MEM", 0);
+ ui->add_field(ui, ib_addr + 4, ib_vmid, "MEMSPACE", 0, BITS(stream->words[0], 4, 5) ? "MEM" : "REG", 0);
ui->add_field(ui, ib_addr + 4, ib_vmid, "OPERATION", BITS(stream->words[0], 6, 8), NULL, 10);
ui->add_field(ui, ib_addr + 4, ib_vmid, "FUNCTION", 0, op_3c_functions[BITS(stream->words[0], 0, 4)], 0);
ui->add_field(ui, ib_addr + 8, ib_vmid, "POLL_ADDRESS_LO", BITS(stream->words[1], 2, 32) << 2, NULL, 16);