diff --git a/src/freedreno/ir3/ir3_parser.y b/src/freedreno/ir3/ir3_parser.y
index 671559eb7ce..60b9ecec6c9 100644
--- a/src/freedreno/ir3/ir3_parser.y
+++ b/src/freedreno/ir3/ir3_parser.y
@@ -1028,9 +1028,9 @@ cat6_a6xx_global_address_pt2:
                             new_src(0, IR3_REG_IMMED)->uim_val = 0;
                             new_src(0, IR3_REG_IMMED)->uim_val = $2;
                         } else {
-                            new_src(0, IR3_REG_IMMED)->uim_val = $2;
                             // Dummy src to smooth the difference between a6xx and a7xx
                             new_src(0, IR3_REG_IMMED)->uim_val = 0;
+                            new_src(0, IR3_REG_IMMED)->uim_val = $2;
                         }
                    }
 
diff --git a/src/freedreno/isa/ir3-cat6.xml b/src/freedreno/isa/ir3-cat6.xml
index 300633a6647..a211bd9eb34 100644
--- a/src/freedreno/isa/ir3-cat6.xml
+++ b/src/freedreno/isa/ir3-cat6.xml
@@ -211,7 +211,7 @@ TODO rename UAV src to "UAV" so disasm_field_cb can find it easily?
 
 	<encode>
 		<map name="SRC2">src->srcs[1]</map>
-		<map name="OFF">extract_reg_uim(src->srcs[2])</map>
+		<map name="OFF">extract_reg_uim(src->srcs[3])</map>
 		<map name="SIZE">extract_reg_uim(src->srcs[4])</map>
 		<map name="SRC1_CONST">!!(src->srcs[0]->flags &amp; IR3_REG_CONST)</map>
 	</encode>
@@ -386,7 +386,7 @@ TODO rename UAV src to "UAV" so disasm_field_cb can find it easily?
 
 	<encode>
 		<map name="SRC2">src->srcs[1]</map>
-		<map name="OFF">extract_reg_uim(src->srcs[2])</map>
+		<map name="OFF">extract_reg_uim(src->srcs[3])</map>
 		<map name="SRC3">src->srcs[4]</map>
 		<map name="SIZE">extract_reg_uim(src->srcs[5])</map>
 		<map name="SRC1_CONST">!!(src->srcs[0]->flags &amp; IR3_REG_CONST)</map>