From 8b93fa149bfbe1ca1a59d89ec53d576aa4ede2ec Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Fri, 14 Jul 2023 12:45:37 +0200 Subject: [PATCH] iris: migrate WA 14016118574 to use the WA framework MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 58829d9f1 ("iris: implement Wa_14016118574") Signed-off-by: Rohan Garg Reviewed-by: José Roberto de Souza Part-of: --- src/gallium/drivers/iris/iris_state.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 2abd5ec87b0..a2afd8cc74b 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -7511,6 +7511,7 @@ iris_upload_render_state(struct iris_context *ice, const struct pipe_draw_indirect_info *indirect, const struct pipe_draw_start_count_bias *sc) { + UNUSED const struct intel_device_info *devinfo = batch->screen->devinfo; bool use_predicate = ice->state.predicate == IRIS_PREDICATE_STATE_USE_BIT; trace_intel_begin_draw(&batch->trace); @@ -7735,9 +7736,10 @@ iris_upload_render_state(struct iris_context *ice, } #if GFX_VERx10 == 125 - if (point_or_line_list(ice->state.prim_mode) || - indirect || (sc->count == 1 || sc->count == 2)) { - iris_emit_pipe_control_write(batch, "Wa_14016118574", + if (intel_needs_workaround(devinfo, 22014412737) && + (point_or_line_list(ice->state.prim_mode) || indirect || + (sc->count == 1 || sc->count == 2))) { + iris_emit_pipe_control_write(batch, "Wa_22014412737", PIPE_CONTROL_WRITE_IMMEDIATE, batch->screen->workaround_bo, batch->screen->workaround_address.offset,