diff --git a/src/freedreno/decode/rddecompiler.c b/src/freedreno/decode/rddecompiler.c
index 2011bbb8b74..8b9eb1bc23a 100644
--- a/src/freedreno/decode/rddecompiler.c
+++ b/src/freedreno/decode/rddecompiler.c
@@ -189,7 +189,7 @@ decompile_shader(const char *name, uint32_t regbase, uint32_t *dwords, int level
       size_t stream_size = 0;
       FILE *stream = open_memstream(&stream_data, &stream_size);
 
-      try_disasm_a3xx(buf, sizedwords, 0, stream, dev_id.gpu_id);
+      try_disasm_a3xx(buf, sizedwords, 0, stream, fd_dev_gen(&dev_id) * 100);
       fclose(stream);
 
       printlvl(level, "{\n");
@@ -512,7 +512,7 @@ emit_header()
           "int main(int argc, char **argv)\n"
           "{\n"
           "\tstruct replay_context ctx;\n"
-          "\tstruct fd_dev_id dev_id = {%u, %" PRIu64 "};\n"
+          "\tstruct fd_dev_id dev_id = {%u, 0x%" PRIx64 "};\n"
           "\treplay_context_init(&ctx, &dev_id, argc, argv);\n"
           "\tstruct cmdstream *cs = ctx.submit_cs;\n\n",
           dev_id.gpu_id, dev_id.chip_id);