From 5df25b68ea9eaf8ef7416b08961fbf3cc0942937 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Sun, 4 Aug 2024 14:56:13 +0200
Subject: [PATCH] rusticl/kernel: properly respect device thread limits per
 dimension

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30504>
(cherry picked from commit b3e925a21ba693fd7423b45405b406bfcb8f088a)
---
 .pick_status.json                            | 2 +-
 src/gallium/frontends/rusticl/core/kernel.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index e1d7f7a4239..54cd1033b41 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -924,7 +924,7 @@
         "description": "rusticl/kernel: properly respect device thread limits per dimension",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/frontends/rusticl/core/kernel.rs b/src/gallium/frontends/rusticl/core/kernel.rs
index 1ddaee62dc5..5e50a63af77 100644
--- a/src/gallium/frontends/rusticl/core/kernel.rs
+++ b/src/gallium/frontends/rusticl/core/kernel.rs
@@ -898,7 +898,7 @@ impl Kernel {
         let total_threads = block.iter().take(work_dim).product::<usize>();
         if threads != 1 && total_threads < subgroups {
             for i in 0..work_dim {
-                if grid[i] * total_threads < threads {
+                if grid[i] * total_threads < threads && grid[i] * block[i] <= dim_threads[i] {
                     block[i] *= grid[i];
                     grid[i] = 1;
                     // can only do it once as nothing is cleanly divisible