diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 9c6f93e2fdf..d3da40ff921 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -5087,7 +5087,9 @@ iris_store_gs_state(const struct intel_device_info *devinfo,
gs.ControlDataHeaderSize =
gs_prog_data->control_data_header_size_hwords;
gs.InstanceControl = gs_prog_data->invocations - 1;
+#if GFX_VER < 20
gs.DispatchMode = DISPATCH_MODE_SIMD8;
+#endif
gs.IncludePrimitiveID = gs_prog_data->include_primitive_id;
gs.ControlDataFormat = gs_prog_data->control_data_format;
gs.ReorderMode = TRAILING;
diff --git a/src/intel/genxml/gen20.xml b/src/intel/genxml/gen20.xml
index 057248d9a3d..f1e913ce228 100644
--- a/src/intel/genxml/gen20.xml
+++ b/src/intel/genxml/gen20.xml
@@ -188,6 +188,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 04547ee6694..d229fe14090 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -1445,7 +1445,9 @@ emit_3dstate_gs(struct anv_graphics_pipeline *pipeline)
gs.Enable = true;
gs.StatisticsEnable = true;
gs.KernelStartPointer = gs_bin->kernel.offset;
+#if GFX_VER < 20
gs.DispatchMode = gs_prog_data->base.dispatch_mode;
+#endif
gs.SingleProgramFlow = false;
gs.VectorMaskEnable = false;