From 34e1d885a52fbfa9828d8f7fefa67ba06e893cc3 Mon Sep 17 00:00:00 2001
From: Satyanvesh Dittakavi <Satyanvesh.Dittakavi@amd.com>
Date: Thu, 24 Mar 2022 11:08:54 +0000
Subject: [PATCH] SWDEV-326793 - hipStreamGetFlags should query the flags for
 null stream

Change-Id: I1d1b833704c135b5a0c695b244380ac6c5b8438e


[ROCm/clr commit: 0af8904b8720f79cf5b6657bc69e5b21bf75abc8]
---
 projects/clr/hipamd/src/hip_stream.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/projects/clr/hipamd/src/hip_stream.cpp b/projects/clr/hipamd/src/hip_stream.cpp
index 3daab05ea5..19c6d14419 100644
--- a/projects/clr/hipamd/src/hip_stream.cpp
+++ b/projects/clr/hipamd/src/hip_stream.cpp
@@ -384,11 +384,16 @@ hipError_t hipDeviceGetStreamPriorityRange(int* leastPriority, int* greatestPrio
 hipError_t hipStreamGetFlags(hipStream_t stream, unsigned int* flags) {
   HIP_INIT_API(hipStreamGetFlags, stream, flags);
 
-  if ((flags != nullptr) && (stream != nullptr)) {
-    if (!hip::isValid(stream)) {
-      HIP_RETURN(hipErrorContextIsDestroyed);
+  if (flags != nullptr) {
+    if (stream == nullptr) {
+      // hipStreamDefault
+      *flags = 0;
+    } else {
+      if (!hip::isValid(stream)) {
+        HIP_RETURN(hipErrorContextIsDestroyed);
+      }
+      *flags = reinterpret_cast<hip::Stream*>(stream)->Flags();
     }
-    *flags = reinterpret_cast<hip::Stream*>(stream)->Flags();
   } else {
     HIP_RETURN(hipErrorInvalidValue);
   }