diff --git a/.pick_status.json b/.pick_status.json
index fa9f83ad5cb..befb3080b40 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3544,7 +3544,7 @@
         "description": "iris: fix incorrect intrinsic usage on ELK",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "faa857a061febb9b8b708c703ceae7031b9febb2",
         "notes": null
diff --git a/src/gallium/drivers/iris/iris_indirect_gen.c b/src/gallium/drivers/iris/iris_indirect_gen.c
index e677e369f2a..652d3c77912 100644
--- a/src/gallium/drivers/iris/iris_indirect_gen.c
+++ b/src/gallium/drivers/iris/iris_indirect_gen.c
@@ -61,10 +61,17 @@
 # error "Unsupported generation"
 #endif
 
+#if GFX_VER < 9
+#define load_param(b, bit_size, struct_name, field_name)          \
+   nir_load_uniform(b, 1, bit_size, nir_imm_int(b, 0),            \
+                    .base = offsetof(struct_name, field_name),    \
+                    .range = bit_size / 8)
+#else
 #define load_param(b, bit_size, struct_name, field_name)                \
    nir_load_push_data_intel(b, 1, bit_size, nir_imm_int(b, 0),          \
                             .base = offsetof(struct_name, field_name),  \
                             .range = bit_size / 8)
+#endif
 
 static nir_def *
 load_fragment_index(nir_builder *b)