Mesa (staging/19.1): radv: Avoid binning RAVEN hangs.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 908d85ffce745ea3e417f807d3f9db6fdd9c3f55
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=908d85ffce745ea3e417f807d3f9db6fdd9c3f55

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Thu Aug  8 02:24:58 2019 +0200

radv: Avoid binning RAVEN hangs.

Mirroring radeonsi.

CC: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 4a3f987afda6469f274485e9f8b4ecc2308ad815)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

Conflicts:
	src/amd/vulkan/radv_pipeline.c

---

 src/amd/vulkan/radv_pipeline.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index c365ca98d3d..636c7277e60 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2674,7 +2674,8 @@ radv_pipeline_generate_binning_state(struct radeon_cmdbuf *ctx_cs,
 	case CHIP_RAVEN:
 	case CHIP_RAVEN2:
 		context_states_per_bin = 6;
-		persistent_states_per_bin = 32;
+		/* 32 causes hangs for RAVEN. */
+		persistent_states_per_bin = 16;
 		fpovs_per_batch = 63;
 		break;
 	default: