diff options
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_state.c | 18 |
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); |