diff --git a/src/gallium/drivers/iris/iris_genx_macros.h b/src/gallium/drivers/iris/iris_genx_macros.h
index d63ea41bb9b..91ab6926fec 100644
--- a/src/gallium/drivers/iris/iris_genx_macros.h
+++ b/src/gallium/drivers/iris/iris_genx_macros.h
@@ -80,6 +80,12 @@ __gen_get_batch_address(struct iris_batch *batch, void *location)
 #include "genxml/gen_macros.h"
 #include "genxml/genX_bits.h"
 
+#if GFX_VER >= 11 && GFX_VERx10 < 125
+#define IRIS_BT_OFFSET_SHIFT 3
+#else
+#define IRIS_BT_OFFSET_SHIFT 0
+#endif
+
 /* CS_GPR(15) is reserved for combining conditional rendering predicates
  * with GL_ARB_indirect_parameters draw number predicates.
  */
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 0f4524ac3e6..af3d3eee4bb 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1143,9 +1143,6 @@ iris_init_common_context(struct iris_batch *batch)
       reg.BindingTableAlignment = BTP_18_8;
       reg.BindingTableAlignmentMask = true;
    }
-#define IRIS_BT_OFFSET_SHIFT 3
-#else
-#define IRIS_BT_OFFSET_SHIFT 0
 #endif
 
 #if GFX_VERx10 == 125