From 5dd15e22cabb126a67639349f897b299b8076137 Mon Sep 17 00:00:00 2001
From: Pengda Xie <33167430+px1624@users.noreply.github.com>
Date: Sat, 8 Nov 2025 02:21:36 -0800
Subject: [PATCH] SWDEV-559514 - Add queue validation to submitMarker sync path
 (#1308)

---
 projects/clr/rocclr/device/rocm/rocvirtual.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/clr/rocclr/device/rocm/rocvirtual.cpp b/projects/clr/rocclr/device/rocm/rocvirtual.cpp
index f8eab66861..db9db931b7 100644
--- a/projects/clr/rocclr/device/rocm/rocvirtual.cpp
+++ b/projects/clr/rocclr/device/rocm/rocvirtual.cpp
@@ -3912,6 +3912,9 @@ void VirtualGPU::submitMarker(amd::Marker& vcmd) {
     if (vcmd.CpuWaitRequested()) {
       // It should be safe to call flush directly if there are not pending dispatches without
       // HSA signal callback
+      if (gpu_queue_ == nullptr) {
+        gpu_queue_ = roc_device_.AcquireActiveNormalQueue();
+      }
       flush(vcmd.GetBatchHead());
     } else {
       profilingBegin(vcmd);