diff options
| author | Jakob P. Liljenberg <admin@qvantnet.com> | 2024-01-27 09:00:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-27 09:00:31 +0100 |
| commit | edcb68cbb91c71de6c890f9392756f1ca15955d4 (patch) | |
| tree | b2655fb5431939a08d1615f7aa30cc4079df00e0 | |
| parent | 4461a431ae7d4608db589b9a1560e43bc6d1e5a2 (diff) | |
| parent | 7d3617a274438c4dde287ff59dd82085609028ae (diff) | |
Merge pull request #737 from fxzjshm/fix-rocm-v6
Fix dynamic loading of ROCm v6
| -rw-r--r-- | src/linux/btop_collect.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp index e9097d9..eb8c2b7 100644 --- a/src/linux/btop_collect.cpp +++ b/src/linux/btop_collect.cpp @@ -160,14 +160,15 @@ namespace Gpu { namespace Rsmi { #if !defined(RSMI_STATIC) //? RSMI defines, structs & typedefs - #define RSMI_MAX_NUM_FREQUENCIES 32 - #define RSMI_STATUS_SUCCESS 0 - #define RSMI_MEM_TYPE_VRAM 0 - #define RSMI_TEMP_CURRENT 0 - #define RSMI_TEMP_TYPE_EDGE 0 - #define RSMI_CLK_TYPE_MEM 4 - #define RSMI_CLK_TYPE_SYS 0 - #define RSMI_TEMP_MAX 1 + #define RSMI_MAX_NUM_FREQUENCIES_V5 32 + #define RSMI_MAX_NUM_FREQUENCIES_V6 33 + #define RSMI_STATUS_SUCCESS 0 + #define RSMI_MEM_TYPE_VRAM 0 + #define RSMI_TEMP_CURRENT 0 + #define RSMI_TEMP_TYPE_EDGE 0 + #define RSMI_CLK_TYPE_MEM 4 + #define RSMI_CLK_TYPE_SYS 0 + #define RSMI_TEMP_MAX 1 typedef int rsmi_status_t, rsmi_temperature_metric_t, @@ -175,8 +176,8 @@ namespace Gpu { rsmi_memory_type_t; struct rsmi_version_t {uint32_t major, minor, patch; const char* build;}; - struct rsmi_frequencies_t_v5 {uint32_t num_supported, current, frequency[RSMI_MAX_NUM_FREQUENCIES];}; - struct rsmi_frequencies_t_v6 {bool has_deep_sleep; uint32_t num_supported, current, frequency[RSMI_MAX_NUM_FREQUENCIES];}; + struct rsmi_frequencies_t_v5 {uint32_t num_supported, current; uint64_t frequency[RSMI_MAX_NUM_FREQUENCIES_V5];}; + struct rsmi_frequencies_t_v6 {bool has_deep_sleep; uint32_t num_supported, current; uint64_t frequency[RSMI_MAX_NUM_FREQUENCIES_V6];}; //? Function pointers rsmi_status_t (*rsmi_init)(uint64_t); @@ -1265,6 +1266,7 @@ namespace Gpu { LOAD_SYM(rsmi_init); LOAD_SYM(rsmi_shut_down); + LOAD_SYM(rsmi_version_get); LOAD_SYM(rsmi_num_monitor_devices); LOAD_SYM(rsmi_dev_name_get); LOAD_SYM(rsmi_dev_power_cap_get); |