summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2021-03-29 12:26:41 -0700
committerDylan Baker <dylan.c.baker@intel.com>2021-04-21 09:53:37 -0700
commitfe34ff91d2d6124ad4ba8b111ed0e74277f88205 (patch)
treee450586857eb67a1a696ece43fa1ebccb9aacab5
parent28083513fcdbff3f7603d22d9f40c71beede27f7 (diff)
iris/gen12: Work around push constant corruption on context switch.
This has been confirmed to fix sporadic graphics corruption on Gen12 platforms for a number of workloads (including Heaven, Valley and CS:GO among others). Corruption seems to occur during context switch fairly consistently, but unfortunately this problem doesn't seem to be documented. Until the hardware team comes up with a better workaround, fix the problem by reemitting constants at the beginning of each batch. No corruption has been observed so far in GL due to preemption, however this is a possibility to keep in mind, it may be necessary to disable preemption in addition to this patch in order to fully address this problem (see also 81201e461772a06ed2). Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4412 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4454 Cc: mesa-stable Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 20e2c7308f67412234847fd66fb330969ae30de0)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/iris/iris_state.c18
2 files changed, 18 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 070e5a03ea2..a1d7928db9a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1210,7 +1210,7 @@
"description": "iris/gen12: Work around push constant corruption on context switch.",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 3ee01b5fb19..d19f0eabd1e 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -6465,9 +6465,25 @@ iris_upload_render_state(struct iris_context *ice,
iris_use_pinned_bo(batch, ice->state.binder.bo, false,
IRIS_DOMAIN_NONE);
+ if (!batch->contains_draw) {
+ if (GEN_GEN == 12) {
+ /* Re-emit constants when starting a new batch buffer in order to
+ * work around push constant corruption on context switch.
+ *
+ * XXX - Provide hardware spec quotation when available.
+ */
+ ice->state.stage_dirty |= (IRIS_STAGE_DIRTY_CONSTANTS_VS |
+ IRIS_STAGE_DIRTY_CONSTANTS_TCS |
+ IRIS_STAGE_DIRTY_CONSTANTS_TES |
+ IRIS_STAGE_DIRTY_CONSTANTS_GS |
+ IRIS_STAGE_DIRTY_CONSTANTS_FS);
+ }
+ batch->contains_draw = true;
+ }
+
if (!batch->contains_draw_with_next_seqno) {
iris_restore_render_saved_bos(ice, batch, draw);
- batch->contains_draw_with_next_seqno = batch->contains_draw = true;
+ batch->contains_draw_with_next_seqno = true;
}
iris_upload_dirty_render_state(ice, batch, draw);