From c6eef97e3e595243c55946886b15a7beba2f83d2 Mon Sep 17 00:00:00 2001
From: Saleel Kudchadker <Saleel.Kudchadker@amd.com>
Date: Thu, 16 Jan 2025 00:58:17 +0000
Subject: [PATCH] SWDEV-504494 - Set active engine for SDMA

Change-Id: I4cec84e71903c5813a7063e8b9ff1ea4473f4720


[ROCm/clr commit: d208e8052f784411f1aea1d4b4d841a70adadf1e]
---
 projects/clr/rocclr/device/rocm/rocblit.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/projects/clr/rocclr/device/rocm/rocblit.cpp b/projects/clr/rocclr/device/rocm/rocblit.cpp
index ad7db8cf9c..108729cebe 100644
--- a/projects/clr/rocclr/device/rocm/rocblit.cpp
+++ b/projects/clr/rocclr/device/rocm/rocblit.cpp
@@ -63,6 +63,7 @@ bool DmaBlitManager::readBuffer(device::Memory& srcMemory, void* dstHost,
     return HostBlitManager::readBuffer(srcMemory, dstHost, origin, size, entire, copyMetadata);
   } else {
     size_t copySize = size[0];
+    ClPrint(amd::LOG_DEBUG, amd::LOG_COPY, "Unpinned read path");
     if (0 != copySize) {
       const_address addrSrc = gpuMem(srcMemory).getDeviceMemory() + origin[0];
       address addrDst = reinterpret_cast<address>(dstHost);
@@ -516,6 +517,7 @@ inline bool DmaBlitManager::rocrCopyBuffer(address dst, hsa_agent_t& dstAgent,
     copyMask = kUseRegularCopyApi ? 0 : dev().fetchSDMAMask(this, true);
   }
 
+  gpu().Barriers().SetActiveEngine(engine);
   // Check if host wait has to be forced
   bool forceHostWait = forceHostWaitFunc(size);