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

[GitLab Mirror]

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

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

freedreno/a6xx: Fix SP_GS_PRIM_SIZE for large sizes

This fixes a few piglit hangs.

Fixes: 0eebedb ("freedreno/a6xx: Emit program state for GS")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10551>
(cherry picked from commit e7b7908f87a437b3d4a239bf9f2119154967757e)

---

 .pick_status.json                                                | 2 +-
 src/gallium/drivers/freedreno/a6xx/fd6_program.c                 | 7 ++++++-
 src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2139b6f6cf9..c1d46da8949 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1777,7 +1777,7 @@
         "description": "freedreno/a6xx: Fix SP_GS_PRIM_SIZE for large sizes",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "0eebedb6190fdab8956769b2485180cc4a07119a"
     },
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
index d1b4e313169..0b19642efa5 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
@@ -901,8 +901,13 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_context *ctx,
       OUT_PKT4(ring, REG_A6XX_PC_MULTIVIEW_CNTL, 1);
       OUT_RING(ring, 0);
 
+      uint32_t prim_size = prev->output_size;
+      if (prim_size > 64)
+         prim_size = 64;
+      else if (prim_size == 64)
+         prim_size = 63;
       OUT_PKT4(ring, REG_A6XX_SP_GS_PRIM_SIZE, 1);
-      OUT_RING(ring, prev->output_size);
+      OUT_RING(ring, prim_size);
    } else {
       OUT_PKT4(ring, REG_A6XX_PC_PRIMITIVE_CNTL_6, 1);
       OUT_RING(ring, 0);
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
index c2dd405fbca..ea67d13a6a8 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
@@ -545,7 +545,6 @@ spec at glsl-1.50@execution at primitive-id-no-gs-quads,Fail
 spec at glsl-1.50@execution at variable-indexing@gs-input-array-float-index-rd,Fail
 spec at glsl-1.50@execution at variable-indexing@gs-input-array-vec2-index-rd,Fail
 spec at glsl-1.50@execution at variable-indexing@gs-input-array-vec3-index-rd,Crash
-spec at glsl-1.50@execution at variable-indexing@gs-input-array-vec4-index-rd,Fail
 spec at glsl-1.50@execution at variable-indexing@gs-output-array-vec3-index-wr,Fail
 spec at glsl-1.50@execution at variable-indexing@gs-output-array-vec4-index-wr,Crash
 spec at glsl-1.50@execution at variable-indexing@vs-output-array-vec3-index-wr-before-gs,Fail