Clean up getAmdGpuInfo_actual

pull/771/head
jackun 2 years ago
parent 9eb8447e14
commit d73932ad17
No known key found for this signature in database
GPG Key ID: 119DB3F1D05A9ED3

@ -17,7 +17,6 @@ using namespace std::chrono_literals;
struct gpuInfo gpu_info {};
amdgpu_files amdgpu {};
decltype(&getAmdGpuInfo) getAmdGpuInfo_actual = nullptr;
bool checkNvidia(const char *pci_dev){
bool nvSuccess = false;

@ -42,7 +42,6 @@ extern struct gpuInfo gpu_info;
void getNvidiaGpuInfo(const struct overlay_params& params);
void getAmdGpuInfo(void);
extern decltype(&getAmdGpuInfo) getAmdGpuInfo_actual;
bool checkNvidia(const char *pci_dev);
extern void nvapi_util();
extern bool checkNVAPI();

@ -101,8 +101,8 @@ void update_hw_info(const struct overlay_params& params, uint32_t vendorID)
#endif
}
if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_stats] || logger->is_active()) {
if (vendorID == 0x1002 && getAmdGpuInfo_actual)
getAmdGpuInfo_actual();
if (vendorID == 0x1002)
getAmdGpuInfo();
if (gpu_metrics_exists)
amdgpu_get_metrics();
@ -624,7 +624,6 @@ void init_gpu_stats(uint32_t& vendorID, uint32_t reported_deviceID, overlay_para
|| gpu.find("AMD") != std::string::npos) {
string path;
string drm = "/sys/class/drm/";
getAmdGpuInfo_actual = getAmdGpuInfo;
auto dirs = ls(drm.c_str(), "card");
for (auto& dir : dirs) {

Loading…
Cancel
Save