From b43b6e71c237cd37d66cf2465bedb8cd1aa7670d Mon Sep 17 00:00:00 2001 From: Marko Oblak Date: Thu, 23 Feb 2023 15:51:45 +0100 Subject: [PATCH 1/2] SWDEV-384518 - [AMDSMI] [Navi32] [Linux] [BM] [Guest] Fixed RAS enabled Python interface Signed-off-by: Marko Oblak Change-Id: Iacdb57ddc63ea3e7ce5c19506577487ab18c0c89 --- py-interface/amdsmi_interface.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 19eb3b72e5..91b26510c5 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -839,24 +839,22 @@ def amdsmi_get_ras_block_features_enabled( ras_state = amdsmi_wrapper.amdsmi_ras_err_state_t() ras_states = [] - for key, gpu_block in amdsmi_wrapper.amdsmi_gpu_block_t__enumvalues.items(): - if gpu_block == "AMDSMI_GPU_BLOCK_RESERVED": + for gpu_block in AmdSmiGpuBlock: + if gpu_block.name == "RESERVED": continue - if gpu_block == "AMDSMI_GPU_BLOCK_LAST": - gpu_block = "AMDSMI_GPU_BLOCK_FUSE" + if gpu_block.name == "LAST": + gpu_block.name = "FUSE" _check_res( amdsmi_wrapper.amdsmi_get_ras_block_features_enabled( device_handle, - amdsmi_wrapper.amdsmi_gpu_block_t(key), + amdsmi_wrapper.amdsmi_gpu_block_t(gpu_block.value), ctypes.byref(ras_state), ) ) ras_states.append( { - "block": gpu_block, - "status": amdsmi_wrapper.amdsmi_ras_err_state_t__enumvalues[ - ras_state.value - ], + "block": gpu_block.name, + "status": AmdSmiRasErrState(ras_state.value).name, } ) From 7b176fc2dfe24f059b5fac44659749fccc384948 Mon Sep 17 00:00:00 2001 From: Dalibor Stanisavljevic Date: Fri, 24 Feb 2023 14:43:20 +0100 Subject: [PATCH 2/2] SWDEV-380736 - Adjusted ouput for amdsmi_get_vram_usage Change-Id: I6a2cd2353a0c3fafc3a3690098a1e279ecd30378 Signed-off-by: Dalibor Stanisavljevic --- py-interface/README.md | 2 +- py-interface/amdsmi_interface.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/py-interface/README.md b/py-interface/README.md index e02eb3b1a1..36b49114f7 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -551,8 +551,8 @@ Output: Dictionary with fields Field | Description ---|--- -`vram_used`| VRAM currently in use `vram_total` | VRAM total +`vram_used`| VRAM currently in use Exceptions that can be thrown by `amdsmi_get_vram_usage` function: * `AmdSmiLibraryException` diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 91b26510c5..c48aedf752 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1027,7 +1027,7 @@ def amdsmi_get_vram_usage( device_handle, ctypes.byref(vram_info)) ) - return {"vram_used": vram_info.vram_used, "vram_total": vram_info.vram_total} + return {"vram_total": vram_info.vram_total, "vram_used": vram_info.vram_used} def amdsmi_get_pcie_link_status(