Mesa (staging/20.1): radv: limit LATE_ALLOC_GS to prevent a GPU hang on GFX10

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: c705840fc9522ab5f7a6e07fd7790e2f2bfd2a40
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c705840fc9522ab5f7a6e07fd7790e2f2bfd2a40

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Aug 11 11:26:16 2020 +0200

radv: limit LATE_ALLOC_GS to prevent a GPU hang on GFX10

Found by inspection, doesn't fix anything known.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6279>
(cherry picked from commit e4c6204d6595d7dc47c23ae637b8aba3307ec2cc)

---

 .pick_status.json              | 2 +-
 src/amd/vulkan/si_cmd_buffer.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3d0eb3c3815..612062ba65f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -202,7 +202,7 @@
         "description": "radv: limit LATE_ALLOC_GS to prevent a GPU hang on GFX10",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index 17b123b6583..471a777b2ad 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -336,6 +336,10 @@ si_emit_graphics(struct radv_device *device,
 				late_alloc_wave64_gs = 0;
 				cu_mask_gs = 0xffff;
 			}
+
+			/* Limit LATE_ALLOC_GS for prevent a hang (hw bug). */
+			if (physical_device->rad_info.chip_class == GFX10)
+				late_alloc_wave64_gs = MIN2(late_alloc_wave64_gs, 64);
 		} else {
 			if (!physical_device->rad_info.use_late_alloc) {
 				late_alloc_wave64 = 0;