From 50d68f74b503d3a65a89f10c32c199cdb4431054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Wed, 5 Jul 2023 15:40:52 -0700 Subject: [PATCH] iris: ensure mesh is disabled on context init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It turns out the hardware doesn't save the whole state on a context switch, as the kernel expects when it creates the golden context. For some HW units, only the state that was explicitly programmed will be part of it, so we need to make sure mesh shading is disabled on context creation, or we risk being context switched with an application that uses mesh, and when ours gets to run again, the mesh state won't be reset, and submitting a legacy 3D pipeline while the HW thinks mesh is enabled causes us to hang. Cc: 23.2 Reviewed-by: Marcin Ślusarz Reviewed-by: José Roberto de Souza Part-of: --- src/gallium/drivers/iris/iris_state.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index ef08abbe10c..2445df96d1b 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -1339,6 +1339,11 @@ iris_init_render_context(struct iris_batch *batch) /* TODO: may need to set an offset for origin-UL framebuffers */ iris_emit_cmd(batch, GENX(3DSTATE_POLY_STIPPLE_OFFSET), foo); +#if GFX_VERx10 >= 125 + iris_emit_cmd(batch, GENX(3DSTATE_MESH_CONTROL), foo); + iris_emit_cmd(batch, GENX(3DSTATE_TASK_CONTROL), foo); +#endif + iris_alloc_push_constants(batch);