From 59c708ff8ae290c5ddf6a41830b6c8917c521ef1 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sun, 16 Sep 2018 12:17:00 +0200 Subject: [PATCH] radv: Set the user SGPR MSB for Vega. Otherwise using 32 user SGPRs would be broken. CC: Reviewed-by: Samuel Pitoiset (cherry picked from commit d97c892584cd0641913de2635689c6b59c98816e) Conflicts resolved by Dylan Conflicts: src/amd/vulkan/radv_shader.c --- src/amd/vulkan/radv_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 70069b677d0..ac29335ca03 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -379,7 +379,8 @@ radv_fill_shader_variant(struct radv_device *device, variant->code_size = binary->code_size; variant->rsrc2 = S_00B12C_USER_SGPR(variant->info.num_user_sgprs) | - S_00B12C_SCRATCH_EN(scratch_enabled); + S_00B12C_USER_SGPR_MSB(variant->info.num_user_sgprs >> 5) | + S_00B12C_SCRATCH_EN(scratch_enabled); variant->rsrc1 = S_00B848_VGPRS((variant->config.num_vgprs - 1) / 4) | S_00B848_SGPRS((variant->config.num_sgprs - 1) / 8) |