From c6f503bed6a5a8190cce2a8c80db74b11d949c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Thu, 30 Apr 2026 07:48:43 +0300 Subject: [PATCH] iris: use INTEL_NEEDS_WA_14025112257 define for workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tapani Pälli Reviewed-by: Sagar Ghuge Part-of: --- src/gallium/drivers/iris/iris_blorp.c | 8 +++----- src/gallium/drivers/iris/iris_state.c | 16 ++++++---------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c index 39737142d11..13b257262dc 100644 --- a/src/gallium/drivers/iris/iris_blorp.c +++ b/src/gallium/drivers/iris/iris_blorp.c @@ -446,14 +446,12 @@ iris_blorp_exec_blitter(struct blorp_batch *blorp_batch, iris_bo_bump_seqno(params->dst.addr.buffer, batch->next_seqno, IRIS_DOMAIN_OTHER_WRITE); - /* - * TDOD: Add INTEL_NEEDS_WA_14025112257 check once HSD is propogated for all - * other impacted platforms. - */ - if (batch->screen->devinfo->ver >= 20 && batch->name == IRIS_BATCH_COMPUTE) { +#if INTEL_NEEDS_WA_14025112257 + if (batch->name == IRIS_BATCH_COMPUTE) { iris_emit_pipe_control_flush(batch, "WA_14025112257", PIPE_CONTROL_STATE_CACHE_INVALIDATE); } +#endif } static void diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index fcc31dc3d6b..3beeea937b1 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -663,14 +663,12 @@ iris_rewrite_compute_walker_pc(struct iris_batch *batch, for (uint32_t i = 0; i < GENX(COMPUTE_WALKER_length); i++) walker[i] |= dwords[i]; - /* - * TDOD: Add INTEL_NEEDS_WA_14025112257 check once HSD is propogated for all - * other impacted platforms. - */ - if (screen->devinfo->ver >= 20 && batch->name == IRIS_BATCH_COMPUTE) { +#if INTEL_NEEDS_WA_14025112257 + if (batch->name == IRIS_BATCH_COMPUTE) { iris_emit_pipe_control_flush(batch, "WA_14025112257", PIPE_CONTROL_STATE_CACHE_INVALIDATE); } +#endif #else UNREACHABLE("Unsupported"); #endif @@ -9227,14 +9225,12 @@ struct GENX(COMPUTE_WALKER_BODY) body = { } } - /* - * TDOD: Add INTEL_NEEDS_WA_14025112257 check once HSD is propogated for all - * other impacted platforms. - */ - if (screen->devinfo->ver >= 20 && batch->name == IRIS_BATCH_COMPUTE) { +#if INTEL_NEEDS_WA_14025112257 + if (batch->name == IRIS_BATCH_COMPUTE) { iris_emit_pipe_control_flush(batch, "WA_14025112257", PIPE_CONTROL_STATE_CACHE_INVALIDATE); } +#endif trace_intel_end_compute(&batch->trace, grid->grid[0], grid->grid[1], grid->grid[2], 0); }