From 117ac5ca01c51d15c6fb8b2f1c475e0e6a28f062 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sun, 30 Oct 2022 23:33:34 +0100 Subject: [PATCH] radv: Make the compute scratch waves per SE as well. Fixes: 278e533ec9c ("radv: update scratch buffer registers on GFX11") Part-of: (cherry picked from commit d876ddc920f1aaf48219f2060de6cc99c003bc5d) --- .pick_status.json | 2 +- src/amd/vulkan/radv_device.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index a11e0da4a81..51a177861b6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1786,7 +1786,7 @@ "description": "radv: Make the compute scratch waves per SE as well.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "278e533ec9c29d68b661bc27cbfbe6bca4f57094" }, diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 1f030cb0176..d8664d72378 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -4246,6 +4246,8 @@ radv_emit_compute_scratch(struct radv_device *device, struct radeon_cmdbuf *cs, radeon_set_sh_reg_seq(cs, R_00B840_COMPUTE_DISPATCH_SCRATCH_BASE_LO, 2); radeon_emit(cs, scratch_va >> 8); radeon_emit(cs, scratch_va >> 40); + + waves /= info->num_se; } radeon_set_sh_reg_seq(cs, R_00B900_COMPUTE_USER_DATA_0, 2);