From: Tom Stellard <thomas.stellard@amd.com>
Date: Fri, 18 Jul 2014 18:40:50 +0000 (-0400)
Subject: radeonsi/compute: Bump number of user sgprs for LLVM 3.5
X-Git-Tag: upstream/10.3~961
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cc5334e42c29e019b3d2a641034bac0983edfdc;p=platform%2Fupstream%2Fmesa.git

radeonsi/compute: Bump number of user sgprs for LLVM 3.5

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 3a9f00f..a7d61e7 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -32,6 +32,11 @@
 #include "radeon_llvm_util.h"
 
 #define MAX_GLOBAL_BUFFERS 20
+#if HAVE_LLVM < 0x0305
+#define NUM_USER_SGPRS 2
+#else
+#define NUM_USER_SGPRS 4
+#endif
 
 struct si_pipe_compute {
 	struct si_context *ctx;
@@ -132,7 +137,7 @@ static void si_launch_grid(
 	uint32_t *kernel_args;
 	uint64_t kernel_args_va;
 	uint64_t shader_va;
-	unsigned arg_user_sgpr_count = 2;
+	unsigned arg_user_sgpr_count = NUM_USER_SGPRS;
 	unsigned i;
 	struct si_pipe_shader *shader = &program->kernels[pc];
 	unsigned lds_blocks;