Mesa (staging/21.1): tu: Fix SP_GS_PRIM_SIZE for large sizes

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 699bcd12cc1b10d71bdb53265cd2d8774dd5bed0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=699bcd12cc1b10d71bdb53265cd2d8774dd5bed0

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Fri Apr 30 18:07:58 2021 +0200

tu: Fix SP_GS_PRIM_SIZE for large sizes

Based on the previous commit.

Fixes: 012773b ("turnip: Configure VPC for geometry shaders")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10551>
(cherry picked from commit 3d5c1c4989b882a6a5d86ac4396c420ecb9871b8)

---

 .pick_status.json                  | 2 +-
 src/freedreno/vulkan/tu_pipeline.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7850bc58757..fedbabef8c4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -229,7 +229,7 @@
         "description": "tu: Fix SP_GS_PRIM_SIZE for large sizes",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "012773be26aafb71ab232a5838d8e5e7dcc3dc55"
     },
diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 78a568172cb..172bad6e7d8 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -1136,8 +1136,13 @@ tu6_emit_vpc(struct tu_cs *cs,
       tu_cs_emit_pkt4(cs, REG_A6XX_PC_PRIMITIVE_CNTL_6, 1);
       tu_cs_emit(cs, A6XX_PC_PRIMITIVE_CNTL_6_STRIDE_IN_VPC(vec4_size));
 
+      uint32_t prim_size = prev_stage_output_size;
+      if (prim_size > 64)
+         prim_size = 64;
+      else if (prim_size == 64)
+         prim_size = 63;
       tu_cs_emit_pkt4(cs, REG_A6XX_SP_GS_PRIM_SIZE, 1);
-      tu_cs_emit(cs, prev_stage_output_size);
+      tu_cs_emit(cs, prim_size);
    }
 }