nvk: properly align slm size
authorKarol Herbst <kherbst@redhat.com>
Fri, 9 Sep 2022 16:46:58 +0000 (18:46 +0200)
committerMarge Bot <emma+marge@anholt.net>
Fri, 4 Aug 2023 21:32:02 +0000 (21:32 +0000)
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

index e1680ff..0334e6a 100644 (file)
@@ -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)