Module: Mesa Branch: master Commit: 1dbcfd2941753b37490d4bbc0d45d289b4988b11 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1dbcfd2941753b37490d4bbc0d45d289b4988b11
Author: Dave Airlie <[email protected]> Date: Mon Sep 11 08:21:56 2017 +0100 radv: realign vgt flush on hawaii workaround with radeonsi. This realigns this code with the radeonsi version and fixes the indirect case to work properly. Reviewed-by: Bas Nieuwenhuizen <[email protected]> Signed-off-by: Dave Airlie <[email protected]> --- src/amd/vulkan/si_cmd_buffer.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index 937f231757..2102c0a30b 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -802,12 +802,18 @@ si_get_ia_multi_vgt_param(struct radv_cmd_buffer *cmd_buffer, if (SI_GS_PER_ES / primgroup_size >= cmd_buffer->device->gs_table_depth - 3) partial_es_wave = true; - /* Hw bug with single-primitive instances and SWITCH_ON_EOI - * on multi-SE chips. */ - if (info->max_se >= 2 && ia_switch_on_eoi && - ((instanced_draw || indirect_draw) && - num_prims <= 1)) - cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_VGT_FLUSH; + /* GS hw bug with single-primitive instances and SWITCH_ON_EOI. + * The hw doc says all multi-SE chips are affected, but amdgpu-pro Vulkan + * only applies it to Hawaii. Do what amdgpu-pro Vulkan does. + */ + if (family == CHIP_HAWAII && ia_switch_on_eoi) { + bool set_vgt_flush = indirect_draw; + if (!set_vgt_flush && instanced_draw) + if (num_prims <= 1) + set_vgt_flush = true; + if (set_vgt_flush) + cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_VGT_FLUSH; + } } return S_028AA8_SWITCH_ON_EOP(ia_switch_on_eop) | _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
