mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 18:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

anv: fixup workaround 16011411144

Browse Source 
We're missing it for the memcpy with streamout

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 5cc4075f95 ("anv, iris: Add Wa_16011411144 for DG2")
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/22930>
This commit is contained in:
Lionel Landwerlin 2023-05-09 11:34:05 +03:00
parent 5a7520d252
commit 7381405095
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/vulkan/genX_cmd_buffer.c
View File

@ -3344,7 +3344,7 @@ genX(cmd_buffer_flush_gfx_state)(struct anv_cmd_buffer *cmd_buffer)
* 3dstate_so_buffer_index_0/1/2/3 states to ensure so_buffer_index_* * 3dstate_so_buffer_index_0/1/2/3 states to ensure so_buffer_index_*
* state is not combined with other state changes. * state is not combined with other state changes.
*/ */
if (intel_device_info_is_dg2(cmd_buffer->device->info)) { if (intel_needs_workaround(cmd_buffer->device->info, 16011411144)) {
anv_add_pending_pipe_bits(cmd_buffer, anv_add_pending_pipe_bits(cmd_buffer,
ANV_PIPE_CS_STALL_BIT, ANV_PIPE_CS_STALL_BIT,
"before SO_BUFFER change WA"); "before SO_BUFFER change WA");
@ -3378,7 +3378,7 @@ genX(cmd_buffer_flush_gfx_state)(struct anv_cmd_buffer *cmd_buffer)
} }
} }
if (intel_device_info_is_dg2(cmd_buffer->device->info)) { if (intel_needs_workaround(cmd_buffer->device->info, 16011411144)) {
/* Wa_16011411144: also CS_STALL after touching SO_BUFFER change */ /* Wa_16011411144: also CS_STALL after touching SO_BUFFER change */
anv_add_pending_pipe_bits(cmd_buffer, anv_add_pending_pipe_bits(cmd_buffer,
ANV_PIPE_CS_STALL_BIT, ANV_PIPE_CS_STALL_BIT,

17
src/intel/vulkan/genX_gpu_memcpy.c
View File

@ -167,6 +167,17 @@ emit_so_memcpy(struct anv_batch *batch, struct anv_device *device,
}); });
/* Wa_16011411144:
*
* SW must insert a PIPE_CONTROL cmd before and after the
* 3dstate_so_buffer_index_0/1/2/3 states to ensure so_buffer_index_*
* state is not combined with other state changes.
*/
if (intel_needs_workaround(device->info, 16011411144)) {
anv_batch_emit(batch, GENX(PIPE_CONTROL), pc)
pc.CommandStreamerStallEnable = true;
}
anv_batch_emit(batch, GENX(3DSTATE_SO_BUFFER), sob) { anv_batch_emit(batch, GENX(3DSTATE_SO_BUFFER), sob) {
#if GFX_VER < 12 #if GFX_VER < 12
sob.SOBufferIndex = 0; sob.SOBufferIndex = 0;
@ -189,6 +200,12 @@ emit_so_memcpy(struct anv_batch *batch, struct anv_device *device,
sob.StreamOffset = 0; sob.StreamOffset = 0;
} }
if (intel_needs_workaround(device->info, 16011411144)) {
/* Wa_16011411144: also CS_STALL after touching SO_BUFFER change */
anv_batch_emit(batch, GENX(PIPE_CONTROL), pc)
pc.CommandStreamerStallEnable = true;
}
dw = anv_batch_emitn(batch, 5, GENX(3DSTATE_SO_DECL_LIST), dw = anv_batch_emitn(batch, 5, GENX(3DSTATE_SO_DECL_LIST),
.StreamtoBufferSelects0 = (1 << 0), .StreamtoBufferSelects0 = (1 << 0),
.NumEntries0 = 1); .NumEntries0 = 1);