diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 1bf5cbd8a59..50b5b9a915a 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -3206,7 +3206,7 @@ genX(streamout_prologue)(struct anv_cmd_buffer *cmd_buffer)
     * level preemption for another reason in genX_state.c so we can skip this
     * for Gfx12.
     */
-   if (!intel_device_info_is_dg2(cmd_buffer->device->info))
+   if (!intel_needs_workaround(cmd_buffer->device->info, 16013994831))
       return;
 
    if (cmd_buffer->state.gfx.pipeline->uses_xfb) {
diff --git a/src/intel/vulkan/genX_gpu_memcpy.c b/src/intel/vulkan/genX_gpu_memcpy.c
index b903ac92c17..14f1ad227c2 100644
--- a/src/intel/vulkan/genX_gpu_memcpy.c
+++ b/src/intel/vulkan/genX_gpu_memcpy.c
@@ -82,7 +82,7 @@ emit_common_so_memcpy(struct anv_batch *batch, struct anv_device *device,
    }
 
    /* Wa_16013994831 - Disable preemption during streamout. */
-   if (intel_device_info_is_dg2(device->info))
+   if (intel_needs_workaround(device->info, 16013994831))
       genX(batch_set_preemption)(batch, false);
 #endif