Merge amd-master into release/rocm-rel-6.1 20240515

Signed-off-by: Maisam Arif <Maisam.Arif@amd.com>
Change-Id: I60104697600aec2ce7e247fa6ae945e6632f8ce7

CMakeLists.txt

@@ -38,7 +38,7 @@ find_program (GIT NAMES git)
 
 ## Setup the package version based on git tags.
 set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver")
-get_package_version_number("7.0.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
+get_package_version_number("7.2.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
 message("Package version: ${PKG_VERSION_STR}")
 set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}")
 set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}")

License.txt

@@ -1,38 +1,22 @@
-The University of Illinois/NCSA
-Open Source License (NCSA)
+MIT License
 
-Copyright (c) 2014-2018, Advanced Micro Devices, Inc. All rights reserved.
-
-Developed by:
-
- AMD Research and AMD HSA Software Development
-
- Advanced Micro Devices, Inc.
-
- www.amd.com
+Copyright (c) 2023-2024, Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal with the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimers.
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimers in
- the documentation and/or other materials provided with the distribution.
- - Neither the names of Advanced Micro Devices, Inc,
- nor the names of its contributors may be used to endorse or promote
- products derived from this Software without specific prior written
- permission.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS WITH THE SOFTWARE.
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 

docs/python_api.rst

@@ -196,8 +196,6 @@ Functions
 
 .. autofunction:: rocm_smi.showPower
 
-.. autofunction:: rocm_smi.showPowerPlayTable
-
 .. autofunction:: rocm_smi.showProduct
 
 .. autofunction:: rocm_smi.showProfile

include/rocm_smi/kfd_ioctl.h

@@ -553,6 +553,7 @@ enum kfd_smi_event {
  KFD_SMI_EVENT_THERMAL_THROTTLE = 2,
  KFD_SMI_EVENT_GPU_PRE_RESET = 3,
  KFD_SMI_EVENT_GPU_POST_RESET = 4,
+ KFD_SMI_EVENT_RING_HANG = 5,
 };
 
 #define KFD_SMI_EVENT_MASK_FROM_INDEX(i) (1ULL << ((i) - 1))

include/rocm_smi/rocm_smi.h

@@ -311,13 +311,15 @@ typedef struct {
  * Event notification event types
  */
 typedef enum {
+ RSMI_EVT_NOTIF_NONE = KFD_SMI_EVENT_NONE, //!< Unused
  RSMI_EVT_NOTIF_VMFAULT = KFD_SMI_EVENT_VMFAULT, //!< VM page fault
  RSMI_EVT_NOTIF_FIRST = RSMI_EVT_NOTIF_VMFAULT,
  RSMI_EVT_NOTIF_THERMAL_THROTTLE = KFD_SMI_EVENT_THERMAL_THROTTLE,
  RSMI_EVT_NOTIF_GPU_PRE_RESET = KFD_SMI_EVENT_GPU_PRE_RESET,
  RSMI_EVT_NOTIF_GPU_POST_RESET = KFD_SMI_EVENT_GPU_POST_RESET,
+ RSMI_EVT_NOTIF_RING_HANG = KFD_SMI_EVENT_RING_HANG,
 
- RSMI_EVT_NOTIF_LAST = RSMI_EVT_NOTIF_GPU_POST_RESET
+ RSMI_EVT_NOTIF_LAST = RSMI_EVT_NOTIF_RING_HANG
 } rsmi_evt_notification_type_t;
 
 /**