From a39d22f2465c67e0582f4aba5d87ba718282b1a6 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Fri, 9 Sep 2022 18:46:58 +0200
Subject: [PATCH] nvk: properly align slm size

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_device.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c
index e1680ff3ccd..0334e6a80e5 100644
--- a/src/nouveau/vulkan/nvk_device.c
+++ b/src/nouveau/vulkan/nvk_device.c
@@ -81,6 +81,11 @@ nvk_slm_area_ensure(struct nvk_device *dev,
 
    uint64_t size = bytes_per_mp * dev->pdev->dev->mp_count;
 
+   /* The hardware seems to require this alignment for
+    * NV9097_SET_SHADER_LOCAL_MEMORY_D_SIZE_LOWER.
+    */
+   size = ALIGN(size, 0x20000);
+
    struct nouveau_ws_bo *bo =
       nouveau_ws_bo_new(dev->pdev->dev, size, 0, NOUVEAU_WS_BO_LOCAL);
    if (bo == NULL)