Merge amd-staging into amd-master 20220610

Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: Iaefd0a9180925d91d2e3ec03be84e5b04cf262b6


[ROCm/rocm_smi_lib commit: 90571416c1]

projects/rocm-smi-lib/python_smi_tools/rocm_smi.py

@@ -1632,7 +1632,10 @@ def showGpusByPid(pidList):
 
             if rsmi_ret_ok(ret):
                 metricName = 'PID %s is using %s DRM device(s)' % (pid, str(num_devices.value))
-                printListLog(metricName, list(dv_indices))
+                if (num_devices.value):
+                    printListLog(metricName, list(dv_indices))
+                else:
+                    printLog(None, metricName, None)
         else:
             print(None, 'Unable to get list of KFD PIDs. A kernel update may be needed', None)
     printLogSpacer()