summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Abbott <cwabbott0@gmail.com>2020-07-22 23:52:50 +0200
committerMarge Bot <eric+marge@anholt.net>2020-07-24 18:43:40 +0000
commitd6d75fcd915afd84a6abac0810a4d0375d297e30 (patch)
treee161ed257aa737edd21c05bd0d86f8da287c4e3b
parent7ad962bf89f4f310a7dfb3dd1416c9dd24b31f43 (diff)
tu: Fix hangs for DS with no output
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5738>
-rw-r--r--src/freedreno/vulkan/tu_pipeline.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 541d834bb9c..679e76fffa4 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -847,6 +847,14 @@ tu6_emit_vpc(struct tu_cs *cs,
tu6_setup_streamout(cs, last_shader, &linkage);
+ /* The GPU hangs on some models when there are no outputs (xs_pack::CNT),
+ * at least when a DS is the last stage, so add a dummy output to keep it
+ * happy if there aren't any. We do this late in order to avoid emitting
+ * any unused code and make sure that optimizations don't remove it.
+ */
+ if (linkage.cnt == 0)
+ ir3_link_add(&linkage, 0, 0x1, linkage.max_loc);
+
/* map outputs of the last shader to VPC */
assert(linkage.cnt <= 32);
const uint32_t sp_out_count = DIV_ROUND_UP(linkage.cnt, 2);