diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index d3da40ff921..716d48e1678 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -5001,7 +5001,9 @@ iris_store_tcs_state(const struct intel_device_info *devinfo,
#endif
#if GFX_VER >= 9
+#if GFX_VER < 20
hs.DispatchMode = vue_prog_data->dispatch_mode;
+#endif
hs.IncludePrimitiveID = tcs_prog_data->include_primitive_id;
#endif
}
diff --git a/src/intel/genxml/gen20.xml b/src/intel/genxml/gen20.xml
index f1e913ce228..0e3a796dbe1 100644
--- a/src/intel/genxml/gen20.xml
+++ b/src/intel/genxml/gen20.xml
@@ -253,6 +253,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index d229fe14090..27264f3a0d0 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -1314,7 +1314,9 @@ emit_3dstate_hs_ds(struct anv_graphics_pipeline *pipeline,
hs.PatchCountThreshold = tcs_prog_data->patch_count_threshold;
#endif
+#if GFX_VER < 20
hs.DispatchMode = tcs_prog_data->base.dispatch_mode;
+#endif
hs.IncludePrimitiveID = tcs_prog_data->include_primitive_id;
};