diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 11f0d926466..1e8c0908851 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -711,6 +711,7 @@
+
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index dfa0656f7b2..a7ef407360d 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -281,6 +281,11 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
s.SurfaceFormat = info->view->format;
+#if GEN_GEN >= 12
+ s.DepthStencilResource =
+ isl_surf_usage_is_depth_or_stencil(info->surf->usage);
+#endif
+
#if GEN_GEN <= 5
s.ColorBufferComponentWriteDisables = info->write_disables;
#else