Fixed upstream bugs, and fixed local issue with igpu/dgpu separation

Author: NineBallo

src/cpp/server/system_info.cpp

@@ -1321,6 +1321,9 @@ std::vector<GPUInfo> LinuxSystemInfo::detect_amd_gpus(const std::string& gpu_typ
         if (!is_gpu || drm_render_minor.empty() || drm_render_minor == "-1")
             continue;
 
+        bool is_integrated = get_amd_is_igpu(drm_render_minor);
+        if ((gpu_type == "integrated" && !is_integrated) || (gpu_type == "discrete" && is_integrated)) continue;
+
         GPUInfo gpu;
         gpu.name = gfx_target_version;
         gpu.available = true;
@@ -1330,17 +1333,17 @@ std::vector<GPUInfo> LinuxSystemInfo::detect_amd_gpus(const std::string& gpu_typ
         gpu.dynamic_gb = get_amd_dynamic_vram(drm_render_minor);
 
         // Detect inference engines
-        std::string device_type = get_amd_is_igpu(drm_render_minor) ? "amd_igpu" : "amd_dgpu";
+        std::string device_type =  is_integrated ? "amd_igpu" : "amd_dgpu";
         gpu.inference_engines = detect_inference_engines(device_type, gfx_target_version);
 
         gpus.push_back(gpu);
+    }
 
-        if (gpus.empty()) {
-            GPUInfo gpu;
-            gpu.available = false;
-            gpu.error = "No AMD " + gpu_type + " GPU found in KFD nodes";
-            gpus.push_back(gpu);
-        }
+    if (gpus.empty()) {
+        GPUInfo gpu;
+        gpu.available = false;
+        gpu.error = "No AMD " + gpu_type + " GPU found in KFD nodes";
+        gpus.push_back(gpu);
     }
 
     return gpus;
@@ -1472,7 +1475,7 @@ double LinuxSystemInfo::get_dynamic_vram() {
 bool LinuxSystemInfo::get_amd_is_igpu(const std::string& drm_render_minor) {
     std::string device_path = "/sys/class/drm/renderD" + drm_render_minor + "/device/";
     std::string board_info_path = device_path + "board_info";
-    return !fs::exists(board_info_path) && fs::is_regular_file(board_info_path);
+    return !(fs::exists(board_info_path) && fs::is_regular_file(board_info_path));
 }
 
 double LinuxSystemInfo::parse_vram_sysfs(const std::string& drm_render_minor, const std::string& deviceFile){