OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: implement Wa_14016118574

Browse Source 
After each 3DPRIMITIVE, we need to send a dummy post sync op if point or
line list was used or if had only 1 or 2 vertices per primitive.

v2: add missing _3DPRIM_POINTLIST_BF (Lionel)

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18746>
This commit is contained in:
Tapani Pälli
2022-09-20 08:17:03 +03:00
committed by Marge Bot
parent c7ff9876d6
commit f2645229c2
3 changed files with 89 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/vulkan/anv_genX.h
View File

@@ -148,6 +148,11 @@ void genX(cmd_emit_timestamp)(struct anv_batch *batch,
struct anv_address addr,
bool end_of_pipe);
void genX(batch_emit_dummy_post_sync_op)(struct anv_batch *batch,
struct anv_device *device,
uint32_t primitive_topology,
uint32_t vertex_count);
void
genX(rasterization_mode)(VkPolygonMode raster_mode,
VkLineRasterizationModeEXT line_mode,

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

@@ -97,6 +97,15 @@ is_render_queue_cmd_buffer(const struct anv_cmd_buffer *cmd_buffer)
return (queue_family->queueFlags & VK_QUEUE_GRAPHICS_BIT) != 0;
}
ALWAYS_INLINE static void
genX(emit_dummy_post_sync_op)(struct anv_cmd_buffer *cmd_buffer,
uint32_t vertex_count)
{
genX(batch_emit_dummy_post_sync_op)(&cmd_buffer->batch, cmd_buffer->device,
cmd_buffer->state.gfx.primitive_topology,
vertex_count);
}
void
genX(cmd_buffer_emit_state_base_address)(struct anv_cmd_buffer *cmd_buffer)
{
@@ -3808,6 +3817,10 @@ void genX(CmdDraw)(
prim.BaseVertexLocation = 0;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, vertexCount);
#endif
update_dirty_vbs_for_gfx8_vb_flush(cmd_buffer, SEQUENTIAL);
trace_intel_end_draw(&cmd_buffer->trace, count);
@@ -3856,6 +3869,11 @@ void genX(CmdDrawMultiEXT)(
prim.StartInstanceLocation = firstInstance;
prim.BaseVertexLocation = 0;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, draw->vertexCount);
#endif
}
update_dirty_vbs_for_gfx8_vb_flush(cmd_buffer, SEQUENTIAL);
@@ -3912,6 +3930,10 @@ void genX(CmdDrawIndexed)(
prim.BaseVertexLocation = vertexOffset;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, indexCount);
#endif
update_dirty_vbs_for_gfx8_vb_flush(cmd_buffer, RANDOM);
trace_intel_end_draw_indexed(&cmd_buffer->trace, count);
@@ -3976,6 +3998,9 @@ void genX(CmdDrawMultiIndexedEXT)(
prim.StartInstanceLocation = firstInstance;
prim.BaseVertexLocation = *pVertexOffset;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, draw->indexCount);
#endif
emitted = false;
}
} else {
@@ -3998,6 +4023,9 @@ void genX(CmdDrawMultiIndexedEXT)(
prim.StartInstanceLocation = firstInstance;
prim.BaseVertexLocation = *pVertexOffset;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, draw->indexCount);
#endif
}
}
} else {
@@ -4016,6 +4044,9 @@ void genX(CmdDrawMultiIndexedEXT)(
prim.StartInstanceLocation = firstInstance;
prim.BaseVertexLocation = draw->vertexOffset;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, draw->indexCount);
#endif
}
}
@@ -4097,6 +4128,10 @@ void genX(CmdDrawIndirectByteCountEXT)(
prim.VertexAccessType = SEQUENTIAL;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, 1);
#endif
update_dirty_vbs_for_gfx8_vb_flush(cmd_buffer, SEQUENTIAL);
trace_intel_end_draw_indirect_byte_count(&cmd_buffer->trace,
@@ -4186,6 +4221,10 @@ void genX(CmdDrawIndirect)(
prim.VertexAccessType = SEQUENTIAL;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, 1);
#endif
update_dirty_vbs_for_gfx8_vb_flush(cmd_buffer, SEQUENTIAL);
offset += stride;
@@ -4243,6 +4282,10 @@ void genX(CmdDrawIndexedIndirect)(
prim.VertexAccessType = RANDOM;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, 1);
#endif
update_dirty_vbs_for_gfx8_vb_flush(cmd_buffer, RANDOM);
offset += stride;
@@ -4390,6 +4433,10 @@ void genX(CmdDrawIndirectCount)(
prim.VertexAccessType = SEQUENTIAL;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, 1);
#endif
update_dirty_vbs_for_gfx8_vb_flush(cmd_buffer, SEQUENTIAL);
offset += stride;
@@ -4458,6 +4505,10 @@ void genX(CmdDrawIndexedIndirectCount)(
prim.VertexAccessType = RANDOM;
}
#if GFX_VERx10 == 125
genX(emit_dummy_post_sync_op)(cmd_buffer, 1);
#endif
update_dirty_vbs_for_gfx8_vb_flush(cmd_buffer, RANDOM);
offset += stride;
@@ -7030,3 +7081,31 @@ void genX(cmd_emit_timestamp)(struct anv_batch *batch,
mi_store(&b, mi_mem64(addr), mi_reg64(TIMESTAMP));
}
}
void
genX(batch_emit_dummy_post_sync_op)(struct anv_batch *batch,
struct anv_device *device,
uint32_t primitive_topology,
uint32_t vertex_count)
{
#if GFX_VERx10 != 125
return;
#endif
if ((primitive_topology == _3DPRIM_POINTLIST ||
primitive_topology == _3DPRIM_LINELIST ||
primitive_topology == _3DPRIM_LINESTRIP ||
primitive_topology == _3DPRIM_LINELIST_ADJ ||
primitive_topology == _3DPRIM_LINESTRIP_ADJ ||
primitive_topology == _3DPRIM_LINELOOP ||
primitive_topology == _3DPRIM_POINTLIST_BF ||
primitive_topology == _3DPRIM_LINESTRIP_CONT ||
primitive_topology == _3DPRIM_LINESTRIP_BF ||
primitive_topology == _3DPRIM_LINESTRIP_CONT_BF) ||
(vertex_count == 1 || vertex_count == 2)) {
anv_batch_emit(batch, GENX(PIPE_CONTROL), pc) {
pc.PostSyncOperation = WriteImmediateData;
pc.Address = device->workaround_address;
anv_debug_dump_pc(pc);
}
}
}

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

@@ -207,6 +207,11 @@ emit_so_memcpy(struct anv_batch *batch, struct anv_device *device,
prim.StartInstanceLocation = 0;
prim.BaseVertexLocation = 0;
}
#if GFX_VERx10 == 125
genX(batch_emit_dummy_post_sync_op)(batch, device, _3DPRIM_POINTLIST,
size / bs);
#endif
}
void