Merge pull request #127 from RadeonOpenCompute/rocm-4.5.x

ROCm 4.5.2 updates
ROCm · Dec 10, 2021 · b3df226 · b3df226
2 parents fc99cf8 + f95a101
commit b3df226
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/core/inc/amd_blit_sdma.h b/src/core/inc/amd_blit_sdma.h
@@ -208,7 +208,7 @@ class BlitSdma : public BlitSdmaBase {
 
   void BuildGetGlobalTimestampCommand(char* cmd_addr, void* write_address);
 
-  void BuildTrapCommand(char* cmd_addr);
+  void BuildTrapCommand(char* cmd_addr, uint32_t event_id);
 
   void BuildGCRCommand(char* cmd_addr, bool invalidate);
 

diff --git a/src/core/runtime/amd_blit_sdma.cpp b/src/core/runtime/amd_blit_sdma.cpp
@@ -384,7 +384,7 @@ hsa_status_t BlitSdma<RingIndexTy, HwIndexMonotonic, SizeToCountOffset, useGCR>:
                       static_cast<uint32_t>(out_signal.signal_.event_id));
     command_addr += fence_command_size_;
 
-    BuildTrapCommand(command_addr);
+    BuildTrapCommand(command_addr, out_signal.signal_.event_id);
   }
 
   ReleaseWriteAddress(curr_index, total_command_size);
@@ -911,13 +911,14 @@ void BlitSdma<RingIndexTy, HwIndexMonotonic, SizeToCountOffset,
 
 template <typename RingIndexTy, bool HwIndexMonotonic, int SizeToCountOffset, bool useGCR>
 void BlitSdma<RingIndexTy, HwIndexMonotonic, SizeToCountOffset, useGCR>::BuildTrapCommand(
-    char* cmd_addr) {
+    char* cmd_addr, uint32_t event_id) {
   SDMA_PKT_TRAP* packet_addr =
       reinterpret_cast<SDMA_PKT_TRAP*>(cmd_addr);
 
   memset(packet_addr, 0, sizeof(SDMA_PKT_TRAP));
 
   packet_addr->HEADER_UNION.op = SDMA_OP_TRAP;
+  packet_addr->INT_CONTEXT_UNION.int_ctx = event_id;
 }
 
 template <typename RingIndexTy, bool HwIndexMonotonic, int SizeToCountOffset, bool useGCR>