anv: fix disabled Wa_14017076903/18022508906

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: d0669f3ede ("intel/dev: switch defect identifiers to use lineage numbers")
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27008>
(cherry picked from commit 695b4a2992)
This commit is contained in:
Lionel Landwerlin
2024-01-11 17:40:39 +02:00
committed by Eric Engestrom
parent d85271f340
commit 572e3a1bfa
3 changed files with 8 additions and 5 deletions

View File

@@ -574,7 +574,7 @@
"description": "anv: fix disabled Wa_14017076903/18022508906",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d0669f3ede53cccc245efaf27e32b68f6150549a",
"notes": null

View File

@@ -1342,6 +1342,7 @@ struct anv_gfx_dynamic_state {
bool RenderingDisable;
uint32_t RenderStreamSelect;
uint32_t ReorderMode;
uint32_t ForceRendering;
} so;
/* 3DSTATE_SAMPLE_MASK */

View File

@@ -354,8 +354,8 @@ genX(cmd_buffer_flush_gfx_runtime_state)(struct anv_cmd_buffer *cmd_buffer)
SET(STREAMOUT, so.RenderingDisable, dyn->rs.rasterizer_discard_enable);
SET(STREAMOUT, so.RenderStreamSelect, dyn->rs.rasterization_stream);
#if INTEL_NEEDS_WA_14017076903
/* Wa_14017076903 :
#if INTEL_NEEDS_WA_18022508906
/* Wa_18022508906 :
*
* SKL PRMs, Volume 7: 3D-Media-GPGPU, Stream Output Logic (SOL) Stage:
*
@@ -383,8 +383,9 @@ genX(cmd_buffer_flush_gfx_runtime_state)(struct anv_cmd_buffer *cmd_buffer)
* Here we force rendering to get SOL_INT::Render_Enable when occlusion
* queries are active.
*/
if (!GET(so.RenderingDisable) && gfx->n_occlusion_queries > 0)
SET(STREAMOUT, so.ForceRendering, Force_on);
SET(STREAMOUT, so.ForceRendering,
(!GET(so.RenderingDisable) && gfx->n_occlusion_queries > 0) ?
Force_on : 0);
#endif
switch (dyn->rs.provoking_vertex) {
@@ -1304,6 +1305,7 @@ genX(cmd_buffer_flush_gfx_hw_state)(struct anv_cmd_buffer *cmd_buffer)
SET(so, so, RenderingDisable);
SET(so, so, RenderStreamSelect);
SET(so, so, ReorderMode);
SET(so, so, ForceRendering);
}
}