From 6a7dcd3e12f876b133da8f0a6c825b73cba015d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Thu, 8 Jun 2023 09:36:57 +0300 Subject: [PATCH] anv: change pipe controls in genX_gpu_memcpy to use pc helper MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/genX_gpu_memcpy.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/intel/vulkan/genX_gpu_memcpy.c b/src/intel/vulkan/genX_gpu_memcpy.c index 1a8eb58..f60cd69 100644 --- a/src/intel/vulkan/genX_gpu_memcpy.c +++ b/src/intel/vulkan/genX_gpu_memcpy.c @@ -174,10 +174,8 @@ emit_so_memcpy(struct anv_batch *batch, struct anv_device *device, * 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; - } + if (intel_needs_workaround(device->info, 16011411144)) + genX(batch_emit_pipe_control)(batch, device->info, ANV_PIPE_CS_STALL_BIT); anv_batch_emit(batch, GENX(3DSTATE_SO_BUFFER), sob) { #if GFX_VER < 12 @@ -201,11 +199,9 @@ emit_so_memcpy(struct anv_batch *batch, struct anv_device *device, 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; - } + /* Wa_16011411144: also CS_STALL after touching SO_BUFFER change */ + if (intel_needs_workaround(device->info, 16011411144)) + genX(batch_emit_pipe_control)(batch, device->info, ANV_PIPE_CS_STALL_BIT); dw = anv_batch_emitn(batch, 5, GENX(3DSTATE_SO_DECL_LIST), .StreamtoBufferSelects0 = (1 << 0), @@ -221,9 +217,7 @@ emit_so_memcpy(struct anv_batch *batch, struct anv_device *device, #if GFX_VERx10 == 125 /* Wa_14015946265: Send PC with CS stall after SO_DECL. */ - anv_batch_emit(batch, GENX(PIPE_CONTROL), pc) { - pc.CommandStreamerStallEnable = true; - } + genX(batch_emit_pipe_control)(batch, device->info, ANV_PIPE_CS_STALL_BIT); #endif anv_batch_emit(batch, GENX(3DSTATE_STREAMOUT), so) { -- 2.7.4