From 5217a77d6d289704fc05635226bef3c483dce45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Mon, 3 Jul 2023 08:15:00 -0700 Subject: [PATCH] anv: Fix compute maximum number of threads value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no mention in spec about subtract one of the number of threads, also Iris and blorp code don't subtract. Alchemist PRMs: Volume 2a: Command Reference: Instructions: CFE_STATE: Maximum Number of Threads: Normally set to the maximum number of threads: (# EUs) * (# threads/EU) Cc: mesa-stable Signed-off-by: José Roberto de Souza Reviewed-by: Rohan Garg Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit c142736f52f537fb0dcef959b1a6bc2ac2e8335e) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5ac8d961dea..c5c57e09934 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4567,7 +4567,7 @@ "description": "anv: Fix compute maximum number of threads value", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index b7fe5627aab..8f03056f696 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -5652,9 +5652,7 @@ genX(cmd_buffer_ensure_cfe_state)(struct anv_cmd_buffer *cmd_buffer, const struct intel_device_info *devinfo = cmd_buffer->device->info; anv_batch_emit(&cmd_buffer->batch, GENX(CFE_STATE), cfe) { - const uint32_t subslices = MAX2(devinfo->subslice_total, 1); - cfe.MaximumNumberofThreads = - devinfo->max_cs_threads * subslices - 1; + cfe.MaximumNumberofThreads = devinfo->max_cs_threads * devinfo->subslice_total; uint32_t scratch_surf = 0xffffffff; if (total_scratch > 0) {