[Mesa-dev] [PATCH 1/6] radv: realign vgt flush on hawaii workaround with radeonsi.

[Bas Nieuwenhuizen]

On Mon, Sep 11, 2017 at 9:26 AM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> This realigns this code with the radeonsi version and fixes
> the indirect case to work properly.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  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 937f231..eb8ce3e 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 Vulkan
> +                * only applies it to Hawaii. Do what Vulkan does.

Maybe clarify that this is about -pro vulkan?

otherwise the series is

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

> +                */
> +               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) |
> --
> 2.9.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev