summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2020-11-11 09:02:31 +0100
committerMarge Bot <eric+marge@anholt.net>2020-11-17 10:34:28 +0000
commit0790105f2f0d1813dc2ecaf5e12e7131730a8bc1 (patch)
treec37a9e80ec9ac21ed36b1d5b08ff90c9443b3d60
parent68f152cb9a65ab20f03d5efb21d6f7ad3cb16e25 (diff)
radv: do VGT_FLUSH when switching NGG -> legacy on Sienna Cichlid
Ported from RadeonSI. Cc: 20.2 Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7566>
-rw-r--r--src/amd/vulkan/radv_cmd_buffer.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index f0a4d05fc6f..51467db62eb 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -4179,14 +4179,15 @@ void radv_CmdBindPipeline(
/* Prefetch all pipeline shaders at first draw time. */
cmd_buffer->state.prefetch_L2_mask |= RADV_PREFETCH_SHADERS;
- if (cmd_buffer->device->physical_device->rad_info.chip_class == GFX10 &&
+ if ((cmd_buffer->device->physical_device->rad_info.chip_class == GFX10 ||
+ cmd_buffer->device->physical_device->rad_info.family == CHIP_SIENNA_CICHLID) &&
cmd_buffer->state.emitted_pipeline &&
radv_pipeline_has_ngg(cmd_buffer->state.emitted_pipeline) &&
!radv_pipeline_has_ngg(cmd_buffer->state.pipeline)) {
/* Transitioning from NGG to legacy GS requires
- * VGT_FLUSH on Navi10-14. VGT_FLUSH is also emitted
- * at the beginning of IBs when legacy GS ring pointers
- * are set.
+ * VGT_FLUSH on GFX10 and Sienna Cichlid. VGT_FLUSH
+ * is also emitted at the beginning of IBs when legacy
+ * GS ring pointers are set.
*/
cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_VGT_FLUSH;
}