iris: migrate WA 14016118574 to use the WA framework

Fixes: 58829d9f1 ("iris: implement Wa_14016118574")
Signed-off-by: Rohan Garg <rohan.garg@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24156>
(cherry picked from commit 8b93fa149b)
This commit is contained in:
Rohan Garg 2023-07-14 12:45:37 +02:00 committed by Dylan Baker
parent f9360a7184
commit 5d9318a0d2
2 changed files with 6 additions and 4 deletions

View file

@ -24,7 +24,7 @@
"description": "iris: migrate WA 14016118574 to use the WA framework",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "58829d9f112809cabaec471a2961ac42bb529ae6",
"notes": null

View file

@ -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,