diff --git a/.pick_status.json b/.pick_status.json
index 52d64124efc..6c2de7abbbc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2650,7 +2650,7 @@
         "description": "radv/llvm: Emit s_barrier at the beginning of NGG non-GS shaders.",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 39abac0d207..3d326c4d6f8 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -3023,6 +3023,10 @@ ac_translate_nir_to_llvm(struct ac_llvm_compiler *ac_llvm, struct nir_shader *co
          LLVMSetInitializer(ctx.gs_ngg_scratch, LLVMGetUndef(asi32));
          LLVMSetAlignment(ctx.gs_ngg_scratch, 4);
       }
+
+      /* GFX10 hang workaround - there needs to be an s_barrier before gs_alloc_req always */
+      if (ctx.ac.chip_class == GFX10 && shader_count == 1)
+         ac_build_s_barrier(&ctx.ac);
    }
 
    for (int shader_idx = 0; shader_idx < shader_count; ++shader_idx) {