From d5d2e046e9d30245d34cb22cbde022e37523092b Mon Sep 17 00:00:00 2001 From: Calder Young Date: Wed, 21 May 2025 23:57:34 -0700 Subject: [PATCH] iris: Fix accidental writes to global dirty bit instead of local Fixes: 0e9a26372b ("iris: implement Wa_14018912822") Part-of: (cherry picked from commit 8547f8b557fe56e445a91a787607f162938ccc6f) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_state.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cef563df096..afe2e49f926 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5214,7 +5214,7 @@ "description": "iris: Fix accidental writes to global dirty bit instead of local", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0e9a26372bb4e6819b8d56b445564395e04c4217", "notes": null diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 072776d1909..f1f6dede645 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -7101,11 +7101,11 @@ iris_upload_dirty_render_state(struct iris_context *ice, /* Blend constants modified for Wa_14018912822. */ if (ice->state.color_blend_zero != color_blend_zero) { ice->state.color_blend_zero = color_blend_zero; - ice->state.dirty |= IRIS_DIRTY_COLOR_CALC_STATE; + dirty |= IRIS_DIRTY_COLOR_CALC_STATE; } if (ice->state.alpha_blend_zero != alpha_blend_zero) { ice->state.alpha_blend_zero = alpha_blend_zero; - ice->state.dirty |= IRIS_DIRTY_COLOR_CALC_STATE; + dirty |= IRIS_DIRTY_COLOR_CALC_STATE; } uint32_t blend_state_header;