mirror of https://github.com/aristocratos/btop.git
Add check for possible librocm_smi64.so.6 and check for version 7 in the function logic
This commit is contained in:
parent
43af034317
commit
c625d512e1
|
@ -1285,6 +1285,7 @@ namespace Gpu {
|
||||||
"librocm_smi64.so",
|
"librocm_smi64.so",
|
||||||
"librocm_smi64.so.5", // fedora
|
"librocm_smi64.so.5", // fedora
|
||||||
"librocm_smi64.so.1.0", // debian
|
"librocm_smi64.so.1.0", // debian
|
||||||
|
"librocm_smi64.so.6"
|
||||||
};
|
};
|
||||||
|
|
||||||
for (const auto& l : libRocAlts) {
|
for (const auto& l : libRocAlts) {
|
||||||
|
@ -1449,7 +1450,7 @@ namespace Gpu {
|
||||||
if constexpr(is_init) gpus_slice[i].supported_functions.gpu_clock = false;
|
if constexpr(is_init) gpus_slice[i].supported_functions.gpu_clock = false;
|
||||||
} else gpus_slice[i].gpu_clock_speed = (long long)frequencies.frequency[frequencies.current]/1000000; // Hz to MHz
|
} else gpus_slice[i].gpu_clock_speed = (long long)frequencies.frequency[frequencies.current]/1000000; // Hz to MHz
|
||||||
}
|
}
|
||||||
else if (version_major == 6) {
|
else if (version.major == 6 || version.major == 7) {
|
||||||
rsmi_frequencies_t_v6 frequencies;
|
rsmi_frequencies_t_v6 frequencies;
|
||||||
result = rsmi_dev_gpu_clk_freq_get_v6(i, RSMI_CLK_TYPE_SYS, &frequencies);
|
result = rsmi_dev_gpu_clk_freq_get_v6(i, RSMI_CLK_TYPE_SYS, &frequencies);
|
||||||
if (result != RSMI_STATUS_SUCCESS) {
|
if (result != RSMI_STATUS_SUCCESS) {
|
||||||
|
@ -1468,7 +1469,7 @@ namespace Gpu {
|
||||||
if constexpr(is_init) gpus_slice[i].supported_functions.mem_clock = false;
|
if constexpr(is_init) gpus_slice[i].supported_functions.mem_clock = false;
|
||||||
} else gpus_slice[i].mem_clock_speed = (long long)frequencies.frequency[frequencies.current]/1000000; // Hz to MHz
|
} else gpus_slice[i].mem_clock_speed = (long long)frequencies.frequency[frequencies.current]/1000000; // Hz to MHz
|
||||||
}
|
}
|
||||||
else if (version_major == 6) {
|
else if (version.major == 6 || version.major == 7) {
|
||||||
rsmi_frequencies_t_v6 frequencies;
|
rsmi_frequencies_t_v6 frequencies;
|
||||||
result = rsmi_dev_gpu_clk_freq_get_v6(i, RSMI_CLK_TYPE_MEM, &frequencies);
|
result = rsmi_dev_gpu_clk_freq_get_v6(i, RSMI_CLK_TYPE_MEM, &frequencies);
|
||||||
if (result != RSMI_STATUS_SUCCESS) {
|
if (result != RSMI_STATUS_SUCCESS) {
|
||||||
|
|
Loading…
Reference in New Issue