diff --git a/src/imagination/include/hwdef/rogue_hw_utils.h b/src/imagination/include/hwdef/rogue_hw_utils.h
index d14f0e20588..4ed2136fe02 100644
--- a/src/imagination/include/hwdef/rogue_hw_utils.h
+++ b/src/imagination/include/hwdef/rogue_hw_utils.h
@@ -259,7 +259,7 @@ rogue_get_render_size_max(const struct pvr_device_info *dev_info)
    rogue_get_render_size_max(dev_info)
 
 static inline uint32_t
-rogue_get_slc_cache_line_size(const struct pvr_device_info *dev_info)
+pvr_get_slc_cache_line_size(const struct pvr_device_info *dev_info)
 {
    return PVR_GET_FEATURE_VALUE(dev_info, slc_cache_line_size_bits, 8U) / 8U;
 }
@@ -313,7 +313,7 @@ rogue_get_cdm_context_resume_buffer_size(const struct pvr_device_info *dev_info)
 {
    if (PVR_HAS_FEATURE(dev_info, gpu_multicore_support)) {
       const uint32_t max_num_cores = rogue_get_max_num_cores(dev_info);
-      const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+      const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
       const uint32_t cdm_context_resume_buffer_stride =
          ALIGN_POT(ROGUE_LLS_CDM_CONTEXT_RESUME_BUFFER_SIZE, cache_line_size);
 
@@ -331,7 +331,7 @@ static inline uint32_t rogue_get_cdm_context_resume_buffer_alignment(
    const struct pvr_device_info *dev_info)
 {
    if (PVR_HAS_FEATURE(dev_info, gpu_multicore_support))
-      return rogue_get_slc_cache_line_size(dev_info);
+      return pvr_get_slc_cache_line_size(dev_info);
 
    return ROGUE_LLS_CDM_CONTEXT_RESUME_BUFFER_ALIGNMENT;
 }
diff --git a/src/imagination/vulkan/pvr_bo.c b/src/imagination/vulkan/pvr_bo.c
index 4985feb2d82..629c4f81fde 100644
--- a/src/imagination/vulkan/pvr_bo.c
+++ b/src/imagination/vulkan/pvr_bo.c
@@ -560,7 +560,7 @@ VkResult pvr_bo_suballoc(struct pvr_suballocator *allocator,
 {
    const struct pvr_device_info *dev_info =
       &allocator->device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    struct pvr_suballoc_bo *suballoc_bo;
    uint32_t alloc_size, aligned_size;
    VkResult result;
diff --git a/src/imagination/vulkan/pvr_border.c b/src/imagination/vulkan/pvr_border.c
index e2db574daca..aad1abad9b1 100644
--- a/src/imagination/vulkan/pvr_border.c
+++ b/src/imagination/vulkan/pvr_border.c
@@ -287,7 +287,7 @@ VkResult pvr_border_color_table_init(struct pvr_border_color_table *const table,
                                      struct pvr_device *const device)
 {
    const struct pvr_device_info *const dev_info = &device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    const uint32_t table_size = sizeof(struct pvr_border_color_table_entry) *
                                PVR_BORDER_COLOR_TABLE_NR_ENTRIES;
 
diff --git a/src/imagination/vulkan/pvr_clear.c b/src/imagination/vulkan/pvr_clear.c
index ce2f5f917fb..dde1571cd64 100644
--- a/src/imagination/vulkan/pvr_clear.c
+++ b/src/imagination/vulkan/pvr_clear.c
@@ -168,7 +168,7 @@ VkResult pvr_emit_ppp_from_template(
 
    struct pvr_device *const device = csb->device;
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    const struct pvr_static_clear_ppp_base *const base =
       &device->static_clear_state.ppp_base;
    struct pvr_suballoc_bo *pvr_bo;
@@ -465,7 +465,7 @@ VkResult pvr_device_init_graphics_static_clear_state(struct pvr_device *device)
    const uint32_t vdm_state_size_in_dw =
       pvr_clear_vdm_state_get_size_in_dw(dev_info, 1);
    struct pvr_device_static_clear_state *state = &device->static_clear_state;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    struct pvr_pds_vertex_shader_program pds_program;
    const pco_precomp_data *precomp_data;
    uint32_t *state_buffer;
diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index c6c1aee2610..358daef02ad 100644
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -325,7 +325,7 @@ pvr_cmd_buffer_upload_tables(struct pvr_device *device,
                              struct pvr_sub_cmd_gfx *const sub_cmd)
 {
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    VkResult result;
 
    assert(!sub_cmd->depth_bias_bo && !sub_cmd->scissor_bo);
@@ -399,7 +399,7 @@ pvr_cmd_buffer_upload_general(struct pvr_cmd_buffer *const cmd_buffer,
 {
    struct pvr_device *const device = cmd_buffer->device;
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    struct pvr_suballoc_bo *suballoc_bo;
    VkResult result;
 
@@ -428,7 +428,7 @@ pvr_cmd_buffer_upload_usc(struct pvr_cmd_buffer *const cmd_buffer,
 {
    struct pvr_device *const device = cmd_buffer->device;
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    struct pvr_suballoc_bo *suballoc_bo;
    VkResult result;
 
@@ -2716,7 +2716,7 @@ VkResult pvr_cmd_buffer_alloc_mem(struct pvr_cmd_buffer *cmd_buffer,
                                   struct pvr_suballoc_bo **const pvr_bo_out)
 {
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&cmd_buffer->device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&cmd_buffer->device->pdevice->dev_info);
    struct pvr_suballoc_bo *suballoc_bo;
    struct pvr_suballocator *allocator;
    VkResult result;
diff --git a/src/imagination/vulkan/pvr_csb.c b/src/imagination/vulkan/pvr_csb.c
index a7e50948793..f187231c10e 100644
--- a/src/imagination/vulkan/pvr_csb.c
+++ b/src/imagination/vulkan/pvr_csb.c
@@ -234,7 +234,7 @@ static bool pvr_csb_buffer_extend(struct pvr_csb *csb)
    const uint8_t stream_reserved_space =
       stream_link_space + ROGUE_VDMCTRL_GUARD_SIZE_DEFAULT;
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&csb->device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&csb->device->pdevice->dev_info);
    size_t current_state_update_size = 0;
    struct pvr_bo *pvr_bo;
    VkResult result;
diff --git a/src/imagination/vulkan/pvr_descriptor_set.c b/src/imagination/vulkan/pvr_descriptor_set.c
index 9eb0de2e6e8..48c9787082e 100644
--- a/src/imagination/vulkan/pvr_descriptor_set.c
+++ b/src/imagination/vulkan/pvr_descriptor_set.c
@@ -258,7 +258,7 @@ VkResult pvr_CreateDescriptorPool(VkDevice _device,
 {
    VK_FROM_HANDLE(pvr_device, device, _device);
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    struct pvr_descriptor_pool *pool;
    uint64_t bo_size = 0;
    VkResult result;
diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c
index 4e663be3375..dce7b5c6730 100644
--- a/src/imagination/vulkan/pvr_device.c
+++ b/src/imagination/vulkan/pvr_device.c
@@ -208,7 +208,7 @@ VkResult pvr_pds_compute_shader_create_and_upload(
    struct pvr_pds_upload *const pds_upload_out)
 {
    const struct pvr_device_info *dev_info = &device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    size_t staging_buffer_size;
    uint32_t *staging_buffer;
    uint32_t *data_buffer;
@@ -576,7 +576,7 @@ static void pvr_device_get_pixel_event_pds_program_data_size(
 static VkResult pvr_device_init_nop_program(struct pvr_device *device)
 {
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    struct pvr_pds_kickusc_program program = { 0 };
    const pco_precomp_data *precomp_data;
    uint32_t staging_buffer_size;
@@ -738,7 +738,7 @@ VkResult pvr_device_tile_buffer_ensure_cap(struct pvr_device *device,
    struct pvr_device_tile_buffer_state *tile_buffer_state =
       &device->tile_buffer_state;
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    VkResult result;
 
    simple_mtx_lock(&tile_buffer_state->mtx);
@@ -1797,7 +1797,7 @@ pvr_framebuffer_create_ppp_state(struct pvr_device *device,
                                  struct pvr_framebuffer *framebuffer)
 {
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    uint32_t ppp_state[3];
    VkResult result;
 
diff --git a/src/imagination/vulkan/pvr_job_context.c b/src/imagination/vulkan/pvr_job_context.c
index d328ff13ea6..de43bb72aac 100644
--- a/src/imagination/vulkan/pvr_job_context.c
+++ b/src/imagination/vulkan/pvr_job_context.c
@@ -91,7 +91,7 @@ static VkResult pvr_pds_pt_store_program_create_and_upload(
 {
    struct pvr_pds_stream_out_terminate_program program = { 0 };
    const struct pvr_device_info *dev_info = &device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    size_t staging_buffer_size;
    uint32_t *staging_buffer;
    uint32_t *data_buffer;
@@ -160,7 +160,7 @@ static VkResult pvr_pds_pt_resume_program_create_and_upload(
 {
    struct pvr_pds_stream_out_init_program program = { 0 };
    const struct pvr_device_info *dev_info = &device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    size_t staging_buffer_size;
    uint32_t *staging_buffer;
    uint32_t *data_buffer;
@@ -322,7 +322,7 @@ static VkResult pvr_pds_render_ctx_sr_program_create_and_upload(
    struct pvr_pds_upload *const pds_upload_out)
 {
    const struct pvr_device_info *dev_info = &device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    const uint32_t pds_data_alignment =
       ROGUE_VDMCTRL_PDS_STATE0_PDS_DATA_SIZE_UNIT_SIZE / 4U;
 
@@ -382,7 +382,7 @@ static VkResult pvr_pds_compute_ctx_sr_program_create_and_upload(
    struct pvr_pds_upload *const pds_upload_out)
 {
    const struct pvr_device_info *dev_info = &device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    const uint32_t pds_data_alignment =
       ROGUE_VDMCTRL_PDS_STATE0_PDS_DATA_SIZE_UNIT_SIZE / 4U;
 
@@ -468,7 +468,7 @@ static VkResult pvr_ctx_sr_programs_setup(struct pvr_device *device,
       ROGUE_LLS_USC_SHARED_REGS_BUFFER_SIZE +
       ROGUE_LLS_SHARED_REGS_RESERVE_SIZE;
    const struct pvr_device_info *dev_info = &device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
    uint64_t usc_store_program_upload_offset;
    uint64_t usc_load_program_upload_offset;
    const pco_precomp_data *precomp_data;
@@ -1232,7 +1232,7 @@ static VkResult pvr_transfer_eot_shaders_init(struct pvr_device *device,
 
    for (uint32_t i = 0; i < ARRAY_SIZE(ctx->usc_eot_bos); i++) {
       const uint32_t cache_line_size =
-         rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+         pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
       struct pvr_eot_props props = {
          .emit_count = i + 1,
          .shared_words = true,
diff --git a/src/imagination/vulkan/pvr_job_render.c b/src/imagination/vulkan/pvr_job_render.c
index ce0b8709992..693d2823b12 100644
--- a/src/imagination/vulkan/pvr_job_render.c
+++ b/src/imagination/vulkan/pvr_job_render.c
@@ -170,7 +170,7 @@ VkResult pvr_free_list_create(struct pvr_device *device,
     * of the two values) and divide this by 4. If the PM page size is 4096
     * bytes then we end up with an alignment of 65536 bytes.
     */
-   cache_line_size = rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+   cache_line_size = pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
 
    addr_alignment =
       MAX2(ROGUE_BIF_PM_FREELIST_BASE_ADDR_ALIGNSIZE, cache_line_size);
diff --git a/src/imagination/vulkan/pvr_pass.c b/src/imagination/vulkan/pvr_pass.c
index 73d1eeb1fcb..b0f8b845a49 100644
--- a/src/imagination/vulkan/pvr_pass.c
+++ b/src/imagination/vulkan/pvr_pass.c
@@ -258,7 +258,7 @@ pvr_load_op_shader_generate(struct pvr_device *device,
                             struct pvr_load_op *load_op)
 {
    const struct pvr_device_info *dev_info = &device->pdevice->dev_info;
-   const uint32_t cache_line_size = rogue_get_slc_cache_line_size(dev_info);
+   const uint32_t cache_line_size = pvr_get_slc_cache_line_size(dev_info);
 
    pco_shader *loadop = pvr_uscgen_loadop(device->pdevice->pco_ctx, load_op);
 
diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c
index ad574112f8e..378d4252283 100644
--- a/src/imagination/vulkan/pvr_pipeline.c
+++ b/src/imagination/vulkan/pvr_pipeline.c
@@ -980,7 +980,7 @@ static VkResult pvr_compute_pipeline_compile(
 {
    struct vk_pipeline_layout *layout = compute_pipeline->base.layout;
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    pco_ctx *pco_ctx = device->pdevice->pco_ctx;
    void *shader_mem_ctx = ralloc_context(NULL);
    pco_data shader_data = { 0 };
@@ -2605,7 +2605,7 @@ pvr_graphics_pipeline_compile(struct pvr_device *const device,
 {
    struct vk_pipeline_layout *layout = gfx_pipeline->base.layout;
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    VkResult result;
 
    struct pvr_vertex_shader_state *vertex_state =
diff --git a/src/imagination/vulkan/pvr_query_compute.c b/src/imagination/vulkan/pvr_query_compute.c
index 8c17e6c5194..a925ef6aaba 100644
--- a/src/imagination/vulkan/pvr_query_compute.c
+++ b/src/imagination/vulkan/pvr_query_compute.c
@@ -148,7 +148,7 @@ static VkResult pvr_create_compute_query_precomp_program(
    struct pvr_compute_query_shader *query_prog)
 {
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    struct pvr_pds_compute_shader_program pds_primary_prog = { 0 };
    const pco_precomp_data *precomp_data;
    VkResult result;
diff --git a/src/imagination/vulkan/pvr_spm.c b/src/imagination/vulkan/pvr_spm.c
index 11e12fb50c3..87af46c7f76 100644
--- a/src/imagination/vulkan/pvr_spm.c
+++ b/src/imagination/vulkan/pvr_spm.c
@@ -125,7 +125,7 @@ pvr_spm_scratch_buffer_alloc(struct pvr_device *device,
                              struct pvr_spm_scratch_buffer **const buffer_out)
 {
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
    struct pvr_spm_scratch_buffer *scratch_buffer;
    struct pvr_bo *bo;
    VkResult result;
diff --git a/src/imagination/vulkan/pvr_transfer_frag_store.c b/src/imagination/vulkan/pvr_transfer_frag_store.c
index b328274918d..9f2e9257ab6 100644
--- a/src/imagination/vulkan/pvr_transfer_frag_store.c
+++ b/src/imagination/vulkan/pvr_transfer_frag_store.c
@@ -187,7 +187,7 @@ static VkResult pvr_transfer_frag_store_entry_data_compile(
       offsetof(struct pvr_combined_image_sampler_descriptor, sampler) / 4;
 
    const uint32_t cache_line_size =
-      rogue_get_slc_cache_line_size(&device->pdevice->dev_info);
+      pvr_get_slc_cache_line_size(&device->pdevice->dev_info);
 
    struct pvr_tq_frag_sh_reg_layout *sh_reg_layout = &entry_data->sh_reg_layout;
    uint32_t next_free_sh_reg = 0;