diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 0f19178708c..a2b34dca0a9 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -1000,9 +1000,8 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr
          goto fail;
    }
 
-   if (device->physical_device->rad_info.gfx_level >= GFX7 &&
-       !(device->instance->debug_flags & RADV_DEBUG_NO_IBS))
-      cik_create_gfx_config(device);
+   if (!(device->instance->debug_flags & RADV_DEBUG_NO_IBS))
+      radv_create_gfx_config(device);
 
    struct vk_pipeline_cache_create_info info = {0};
    device->mem_cache = vk_pipeline_cache_create(&device->vk, &info, NULL);
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 7dfcbbc6878..b7f779d2763 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1898,7 +1898,7 @@ void radv_emit_streamout_enable(struct radv_cmd_buffer *cmd_buffer);
 void si_emit_graphics(struct radv_device *device, struct radeon_cmdbuf *cs);
 void si_emit_compute(struct radv_device *device, struct radeon_cmdbuf *cs);
 
-void cik_create_gfx_config(struct radv_device *device);
+void radv_create_gfx_config(struct radv_device *device);
 
 void si_write_scissors(struct radeon_cmdbuf *cs, int count, const VkRect2D *scissors, const VkViewport *viewports);
 
diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index fa6cc45083b..c7b1e0056ca 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -618,7 +618,7 @@ si_emit_graphics(struct radv_device *device, struct radeon_cmdbuf *cs)
 }
 
 void
-cik_create_gfx_config(struct radv_device *device)
+radv_create_gfx_config(struct radv_device *device)
 {
    struct radeon_cmdbuf *cs = device->ws->cs_create(device->ws, AMD_IP_GFX, false);
    if (!cs)