Merge amd-staging into amd-master 20220708

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

include/rocm_smi/rocm_smi.h

@@ -2226,8 +2226,8 @@ rsmi_status_t rsmi_dev_perf_level_get(uint32_t dv_ind,
  *  @retval ::RSMI_STATUS_INVALID_ARGS the provided arguments are not valid
  *
  */
-
 rsmi_status_t rsmi_perf_determinism_mode_set(uint32_t dv_ind, uint64_t clkvalue);
+
 /**
  *  @brief Get the overdrive percent associated with the device with provided
  *  device index.
@@ -2253,6 +2253,31 @@ rsmi_status_t rsmi_perf_determinism_mode_set(uint32_t dv_ind, uint64_t clkvalue)
  */
 rsmi_status_t rsmi_dev_overdrive_level_get(uint32_t dv_ind, uint32_t *od);
 
+/**
+ *  @brief Get the memory clock overdrive percent associated with the device
+ *  with provided device index.
+ *
+ *  @details Given a device index @p dv_ind and a pointer to a uint32_t @p od,
+ *  this function will write the memory overdrive percentage to the uint32_t
+ *  pointed to by @p od
+ *
+ *  @param[in] dv_ind a device index
+ *
+ *  @param[inout] od a pointer to uint32_t to which the overdrive percentage
+ *  will be written
+ *  If this parameter is nullptr, this function will return
+ *  ::RSMI_STATUS_INVALID_ARGS if the function is supported with the provided,
+ *  arguments and ::RSMI_STATUS_NOT_SUPPORTED if it is not supported with the
+ *  provided arguments.
+ *
+ *  @retval ::RSMI_STATUS_SUCCESS call was successful
+ *  @retval ::RSMI_STATUS_NOT_SUPPORTED installed software or hardware does not
+ *  support this function with the given arguments
+ *  @retval ::RSMI_STATUS_INVALID_ARGS the provided arguments are not valid
+ *
+ */
+rsmi_status_t rsmi_dev_mem_overdrive_level_get(uint32_t dv_ind, uint32_t *od);
+
 /**
  *  @brief Get the list of possible system clock speeds of device for a
  *  specified clock type.
@@ -2283,31 +2308,6 @@ rsmi_status_t rsmi_dev_overdrive_level_get(uint32_t dv_ind, uint32_t *od);
  *  @retval ::RSMI_STATUS_INVALID_ARGS the provided arguments are not valid
  *
  */
-rsmi_status_t rsmi_dev_mem_overdrive_level_get(uint32_t dv_ind, uint32_t *od);
-
-/**
- *  @brief Get the memory clock overdrive percent associated with the device
- *  with provided device index.
- *
- *  @details Given a device index @p dv_ind and a pointer to a uint32_t @p od,
- *  this function will write the memory overdrive percentage to the uint32_t
- *  pointed to by @p od
- *
- *  @param[in] dv_ind a device index
- *
- *  @param[inout] od a pointer to uint32_t to which the overdrive percentage
- *  will be written
- *  If this parameter is nullptr, this function will return
- *  ::RSMI_STATUS_INVALID_ARGS if the function is supported with the provided,
- *  arguments and ::RSMI_STATUS_NOT_SUPPORTED if it is not supported with the
- *  provided arguments.
- *
- *  @retval ::RSMI_STATUS_SUCCESS call was successful
- *  @retval ::RSMI_STATUS_NOT_SUPPORTED installed software or hardware does not
- *  support this function with the given arguments
- *  @retval ::RSMI_STATUS_INVALID_ARGS the provided arguments are not valid
- *
- */
 rsmi_status_t rsmi_dev_gpu_clk_freq_get(uint32_t dv_ind,
                              rsmi_clk_type_t clk_type, rsmi_frequencies_t *f);
 

python_smi_tools/rocm_smi.py

@@ -455,7 +455,7 @@ def printErrLog(device, err):
     global PRINT_JSON
     devName = device
     for line in err.split('\n'):
-        errstr = 'GPU[%s] \t\t: %s' % (devName, line)
+        errstr = 'GPU[%s]\t: %s' % (devName, line)
         if not PRINT_JSON:
             logging.error(errstr)
         else: