diff --git a/src/freedreno/isa/decode.c b/src/freedreno/isa/decode.c
index 05d5d5b26cb..4719301f10f 100644
--- a/src/freedreno/isa/decode.c
+++ b/src/freedreno/isa/decode.c
@@ -613,6 +613,12 @@ display(struct decode_scope *scope)
 	}
 }
 
+static inline void
+next_instruction(bitmask_t *instr, uint64_t *start)
+{
+	*instr = *start;
+}
+
 static void
 decode(struct decode_state *state, void *bin, int sz)
 {
@@ -620,7 +626,9 @@ decode(struct decode_state *state, void *bin, int sz)
 	unsigned errors = 0;   /* number of consecutive unmatched instructions */
 
 	for (state->n = 0; state->n < state->num_instr; state->n++) {
-		uint64_t instr = instrs[state->n];
+		bitmask_t instr = { 0 };
+
+		next_instruction(&instr, &instrs[state->n]);
 
 		if (state->options->max_errors && (errors > state->options->max_errors)) {
 			break;