From 68c06558be46421ae3357c0062bd0525f804e097 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 11 Jul 2024 16:03:56 -0500 Subject: [PATCH] nvk: Drop the sparse alignment back down to 4096 nouveau uses the OS page size which is almost always 4096. The next patch will make this properly queried but this version is back-portable. Fixes: 58181b7bbcf9 ("nvk: Bump the sparse alignment requirement on buffers to 64K") Part-of: --- src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt | 2 -- src/nouveau/vulkan/nvk_private.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt b/src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt index 263061224d1..dc27cd8f48b 100644 --- a/src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt @@ -701,8 +701,6 @@ spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgrad,Fail spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,Fail spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail -spec@arb_sparse_buffer@basic,Crash -spec@arb_sparse_buffer@buffer-data,Crash spec@arb_texture_buffer_object@formats (fs- arb),Crash spec@arb_texture_buffer_object@formats (fs- arb)@GL_ALPHA16,Fail spec@arb_texture_buffer_object@formats (fs- arb)@GL_ALPHA16F_ARB,Fail diff --git a/src/nouveau/vulkan/nvk_private.h b/src/nouveau/vulkan/nvk_private.h index 5d1ad7d4832..4df510e0c1f 100644 --- a/src/nouveau/vulkan/nvk_private.h +++ b/src/nouveau/vulkan/nvk_private.h @@ -35,7 +35,7 @@ /* Max size of a bound cbuf */ #define NVK_MAX_CBUF_SIZE (1u << 16) -#define NVK_SPARSE_BIND_ALIGN_B (1u << 16) +#define NVK_SPARSE_BIND_ALIGN_B (1u << 12) struct nvk_addr_range { uint64_t addr;