Merge amd-staging into amd-master 20230224

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

CMakeLists.txt

@@ -231,7 +231,7 @@ endif()
 
 #Debian package specific variables
 set(CPACK_DEBIAN_PACKAGE_PROVIDES "amd-smi")
-set(CPACK_DEBIAN_PACKAGE_SUGGESTS "sudo, libdrm-dev")
+set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "sudo, libdrm-dev")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3")
 
 ## Process the Debian install/remove scripts to update the CPACK variables

README.md

@@ -135,7 +135,7 @@ int main() {
       int64_t val_i64 = 0;
       ret =  amdsmi_dev_get_temp_metric(device_handles[j], TEMPERATURE_TYPE_EDGE,
               AMDSMI_TEMP_CURRENT, &val_i64);
-      std::cout << "\t\tTemperature: " << val_i64/1000 << "C" << std::endl;
+      std::cout << "\t\tTemperature: " << val_i64 << "C" << std::endl;
     }
   }
  

example/amd_smi_drm_example.cc

@@ -640,7 +640,7 @@ int main() {
                                              AMDSMI_TEMP_CURRENT, &val_i64);
             CHK_AMDSMI_RET(ret)
             printf("    Output of  amdsmi_dev_get_temp_metric:\n");
-            std::cout << "\t\tTemperature: " << val_i64 / 1000 << "C"
+            std::cout << "\t\tTemperature: " << val_i64 << "C"
                       << "\n\n";
 
             // Get frame buffer

example/amd_smi_nodrm_example.cc

@@ -304,7 +304,7 @@ int main() {
                                              AMDSMI_TEMP_CURRENT, &val_i64);
             CHK_AMDSMI_RET(ret)
             printf("    Output of  amdsmi_dev_get_temp_metric:\n");
-            std::cout << "\t\tTemperature: " << val_i64 / 1000 << "C"
+            std::cout << "\t\tTemperature: " << val_i64 << "C"
                       << "\n\n";
 
             // Get frame buffer

include/amd_smi/amdsmi.h

@@ -87,6 +87,26 @@ typedef enum {
 #define AMDSMI_TIME_FORMAT "%02d:%02d:%02d.%03d"
 #define AMDSMI_DATE_FORMAT "%04d-%02d-%02d:%02d:%02d:%02d.%03d"
 
+/**
+ * @brief library versioning
+ */
+
+//! Year should follow the IP driver package version: 22.40/23.10 and similar
+#define AMDSMI_LIB_VERSION_YEAR 23
+
+//! Major version should be changed for every header change (adding/deleting APIs, changing names, fields of structures, etc.)
+#define AMDSMI_LIB_VERSION_MAJOR 1
+
+//! Minor version should be updated for each API change, but without changing headers
+#define AMDSMI_LIB_VERSION_MINOR 1
+
+//! Release version should be set to 0 as default and can be updated by the PMs for each CSP point release
+#define AMDSMI_LIB_VERSION_RELEASE 0
+
+#define AMDSMI_LIB_VERSION_CREATE_STRING(YEAR, MAJOR, MINOR, RELEASE) (#YEAR "." #MAJOR "." #MINOR "." #RELEASE)
+#define AMDSMI_LIB_VERSION_EXPAND_PARTS(YEAR_STR, MAJOR_STR, MINOR_STR, RELEASE_STR) AMDSMI_LIB_VERSION_CREATE_STRING(YEAR_STR, MAJOR_STR, MINOR_STR, RELEASE_STR)
+#define AMDSMI_LIB_VERSION_STRING AMDSMI_LIB_VERSION_EXPAND_PARTS(AMDSMI_LIB_VERSION_YEAR, AMDSMI_LIB_VERSION_MAJOR, AMDSMI_LIB_VERSION_MINOR, AMDSMI_LIB_VERSION_RELEASE)
+
 typedef enum {
   AMDSMI_MM_UVD,
   AMDSMI_MM_VCE,

src/amd_smi/amd_smi.cc

@@ -336,14 +336,14 @@ amdsmi_status_t  amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle,
                 device_handle, &metric_info);
         if (r_status != AMDSMI_STATUS_SUCCESS)
             return r_status;
-
         *temperature = metric_info.temperature_vrsoc;
         return r_status;
     }
-
-    return rsmi_wrapper(rsmi_dev_temp_metric_get, device_handle,
+    amdsmi_status_t amdsmi_status = rsmi_wrapper(rsmi_dev_temp_metric_get, device_handle,
             static_cast<uint32_t>(sensor_type),
             static_cast<rsmi_temperature_metric_t>(metric), temperature);
+    *temperature /= 1000;
+    return amdsmi_status;
 }
 
 amdsmi_status_t amdsmi_get_vram_usage(amdsmi_device_handle device_handle,