diff --git a/.pick_status.json b/.pick_status.json
index 94fea2e3cc5..8421d8fffd1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1854,7 +1854,7 @@
         "description": "pvr: move PVR_BUFFER_MEMORY_PADDING_SIZE definition to pvr_buffer.h",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/imagination/vulkan/pvr_arch_device.c b/src/imagination/vulkan/pvr_arch_device.c
index bfa50b3d574..c2d266f8a67 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 fdbdf010e66..ff7daef63a6 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)