From d992474be94b981582f7ab97f66a4c8eecb2c7d4 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Fri, 20 Mar 2026 22:08:11 +0800 Subject: [PATCH] pvr: move PVR_BUFFER_MEMORY_PADDING_SIZE definition to pvr_buffer.h This memory padding is enforced by GetBufferMemoryRequirements2 and might be then checked against to decide whether it's enough. Move it to pvr_buffer.h for further assertions. Backport-to: 25.3 Signed-off-by: Icenowy Zheng Reviewed-by: Ella Stanforth Part-of: --- src/imagination/vulkan/pvr_arch_device.c | 5 ----- src/imagination/vulkan/pvr_buffer.h | 5 +++++ src/imagination/vulkan/pvr_device.c | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/imagination/vulkan/pvr_arch_device.c b/src/imagination/vulkan/pvr_arch_device.c index a28179d6ccd..64b0e3244c9 100644 --- a/src/imagination/vulkan/pvr_arch_device.c +++ b/src/imagination/vulkan/pvr_arch_device.c @@ -49,11 +49,6 @@ */ #define PVR_GLOBAL_FREE_LIST_GROW_THRESHOLD 13U -/* Amount of padding required for VkBuffers to ensure we don't read beyond - * a page boundary. - */ -#define PVR_BUFFER_MEMORY_PADDING_SIZE 4 - /* Default size in bytes used by pvr_CreateDevice() for setting up the * suballoc_general, suballoc_pds and suballoc_usc suballocators. * diff --git a/src/imagination/vulkan/pvr_buffer.h b/src/imagination/vulkan/pvr_buffer.h index 3db2b1bb40d..2315235b61b 100644 --- a/src/imagination/vulkan/pvr_buffer.h +++ b/src/imagination/vulkan/pvr_buffer.h @@ -19,6 +19,11 @@ #include "pvr_common.h" +/* Amount of padding required for VkBuffers to ensure we don't read beyond + * a page boundary. + */ +#define PVR_BUFFER_MEMORY_PADDING_SIZE 4 + struct pvr_buffer { struct vk_buffer vk; diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c index 8a152c0286c..33e8fd98662 100644 --- a/src/imagination/vulkan/pvr_device.c +++ b/src/imagination/vulkan/pvr_device.c @@ -73,11 +73,6 @@ #include "vk_sampler.h" #include "vk_util.h" -/* Amount of padding required for VkBuffers to ensure we don't read beyond - * a page boundary. - */ -#define PVR_BUFFER_MEMORY_PADDING_SIZE 4 - /** Gets the amount of memory to allocate per-core for a tile buffer. */ static uint32_t pvr_get_tile_buffer_size_per_core(const struct pvr_device *device)