diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index a8a14439..4a78231e 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -39,7 +39,10 @@ CODEOWNERS @Calcprogrammer1 /Controllers/E131Controller/ /Controllers/EKController/ @Dr_No /Controllers/ENESMBusController/ -/Controllers/EVGAGPUController/ @TheRogueZeta +/Controllers/EVGAAmpereGPUController/ @TheRogueZeta +/Controllers/EVGAGP102GPUController/ +/Controllers/EVGAPascalGPUController/ +/Controllers/EVGATuringGPUController/ @TheRogueZeta /Controllers/EVisionKeyboardController/ /Controllers/EspurnaController/ /Controllers/FanBusController/ diff --git a/Controllers/EVGAAmpereGPUController/EVGAAmpereGPUControllerDetect.cpp b/Controllers/EVGAAmpereGPUController/EVGAAmpereGPUControllerDetect.cpp new file mode 100644 index 00000000..090fd79c --- /dev/null +++ b/Controllers/EVGAAmpereGPUController/EVGAAmpereGPUControllerDetect.cpp @@ -0,0 +1,121 @@ +#include "Detector.h" +#include "EVGAGPUv3Controller.h" +#include "LogManager.h" +#include "RGBController.h" +#include "RGBController_EVGAGPUv3.h" +#include "i2c_smbus.h" +#include "pci_ids.h" +#include +#include +#include + +typedef struct +{ + int pci_vendor; + int pci_device; + int pci_subsystem_vendor; + int pci_subsystem_device; + const char * name; +} gpu_pci_device; + +#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ])) + +static const gpu_pci_device device_list[] = +{ + { NVIDIA_VEN, NVIDIA_RTX3060TI_DEV, EVGA_SUB_VEN, EVGA_RTX3060TI_FTW3_GAMING_SUB_DEV, "EVGA GeForce RTX 3060TI FTW3 Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX3060TI_DEV, EVGA_SUB_VEN, EVGA_RTX3060TI_FTW3_ULTRA_KL_SUB_DEV, "EVGA GeForce RTX 3060TI FTW3 Ultra LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3060TI_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3060TI_FTW3_ULTRA_KL_SUB_DEV, "EVGA GeForce RTX 3060TI FTW3 Ultra LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3070_DEV, EVGA_SUB_VEN, EVGA_RTX3070_XC3_BLACK_SUB_DEV, "EVGA GeForce RTX 3070 Black Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX3070_DEV, EVGA_SUB_VEN, EVGA_RTX3070_XC3_GAMING_SUB_DEV, "EVGA GeForce RTX 3070 XC3 Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX3070_DEV, EVGA_SUB_VEN, EVGA_RTX3070_XC3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3070 XC3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3070_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3070_XC3_ULTRA_LHR_SUB_DEV, "EVGA GeForce RTX 3070 XC3 Ultra LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3070_DEV, EVGA_SUB_VEN, EVGA_RTX3070_FTW3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3070 FTW3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3070_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3070_FTW3_ULTRA_LHR_SUB_DEV, "EVGA GeForce RTX 3070 FTW3 Ultra LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3070TI_DEV, EVGA_SUB_VEN, EVGA_RTX3070TI_XC3_GAMING_SUB_DEV, "EVGA GeForce RTX 3070Ti XC3 Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX3070TI_DEV, EVGA_SUB_VEN, EVGA_RTX3070TI_XC3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3070Ti XC3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3070TI_DEV, EVGA_SUB_VEN, EVGA_RTX3070TI_FTW3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3070Ti FTW3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_BLACK_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Black" }, + { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_BLACK_LHR_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Black LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_GAMING_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_GAMING_LHR_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Gaming LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_LHR_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Ultra LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_HYBRID_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Ultra Hybrid" }, + { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_HYBRID_LHR_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Ultra Hybrid LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_HC_SUB_DEV, "EVGA GeForce RTX 3080 XC3 Ultra Hydro Copper" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_GAMING_SUB_DEV, "EVGA GeForce RTX 3080 FTW3 Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3080 FTW3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3080_12G_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_12G_SUB_DEV, "EVGA GeForce RTX 3080 FTW3 Ultra 12GB" }, + { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_LHR_SUB_DEV, "EVGA GeForce RTX 3080 FTW3 Ultra LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_HYBRID_SUB_DEV, "EVGA GeForce RTX 3080 FTW3 Ultra Hybrid" }, + { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_HYBRID_LHR_SUB_DEV, "EVGA GeForce RTX 3080 FTW3 Ultra Hybrid LHR" }, + { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_HC_SUB_DEV, "EVGA GeForce RTX 3080 FTW3 Ultra Hydro Copper" }, + { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_XC3_GAMING_SUB_DEV, "EVGA GeForce RTX 3080Ti XC3 Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_XC3_GAMING_HYBRID_SUB_DEV, "EVGA GeForce RTX 3080Ti XC3 Gaming Hybrid" }, + { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_XC3_GAMING_HC_SUB_DEV, "EVGA GeForce RTX 3080Ti XC3 Gaming Hydro Copper" }, + { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_FTW3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3080Ti FTW3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_FTW3_ULTRA_HYBRID_SUB_DEV, "EVGA GeForce RTX 3080Ti FTW3 Ultra Hybrid" }, + { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_FTW3_ULTRA_HC_SUB_DEV, "EVGA GeForce RTX 3080Ti FTW3 Ultra Hydro Copper" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_BLACK_SUB_DEV, "EVGA GeForce RTX 3090 XC3 Black" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_GAMING_SUB_DEV, "EVGA GeForce RTX 3090 XC3 Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3090 XC3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_ULTRA_HYBRID_SUB_DEV, "EVGA GeForce RTX 3090 XC3 Ultra Hybrid" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_ULTRA_HC_SUB_DEV, "EVGA GeForce RTX 3090 XC3 Ultra Hydro Copper" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_FTW3_ULTRA_SUB_DEV, "EVGA GeForce RTX 3090 FTW3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_FTW3_ULTRA_V2_SUB_DEV, "EVGA GeForce RTX 3090 FTW3 Ultra v2" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_FTW3_ULTRA_HYBRID_SUB_DEV, "EVGA GeForce RTX 3090 FTW3 Ultra Hybrid" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_FTW3_ULTRA_HC_SUB_DEV, "EVGA GeForce RTX 3090 FTW3 Ultra Hydro Copper" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_KINGPIN_HYBRID_SUB_DEV, "EVGA GeForce RTX 3090 K|NGP|N Hybrid" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_KINGPIN_HC_SUB_DEV, "EVGA GeForce RTX 3090 K|NGP|N Hydro Copper" }, +}; +/******************************************************************************************\ +* * +* DetectEVGAAmpereGPUControllers * +* * +* Detect EVGA Ampere GPU controllers on the enumerated I2C busses at address 0x2D. * +* * +* bus - pointer to i2c_smbus_interface where EVGA GPU device is connected * +* dev - I2C address of EVGA GPU device * +* * +\******************************************************************************************/ + +void DetectEVGAAmpereGPUControllers(std::vector& busses) +{ + for (unsigned int bus = 0; bus < busses.size(); bus++) + { + for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++) + { + if (busses[bus]->port_id != 1) + { + break; + } + + if(busses[bus]->pci_vendor == device_list[dev_idx].pci_vendor && + busses[bus]->pci_device == device_list[dev_idx].pci_device && + busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor && + busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device) + { + LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV3_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); + EVGAGPUv3Controller* new_controller; + RGBController_EVGAGPUv3* new_rgbcontroller; + + new_controller = new EVGAGPUv3Controller(busses[bus], 0x2D); + new_controller-> evgaGPUName = device_list[dev_idx].name; // Pass name of the card into the controller for logging. + + if(new_controller-> ReadFWVersion() != "") + { + new_rgbcontroller = new RGBController_EVGAGPUv3(new_controller); + new_rgbcontroller->name = device_list[dev_idx].name; + ResourceManager::get()->RegisterRGBController(new_rgbcontroller); + } + else + { + LOG_INFO("[%s] Failed to get a valid FW version, does the i2c interface support `i2c_smbus_read_i2c_block_data`?", new_controller-> evgaGPUName); + delete new_controller; + } + } + } + } +} /* DetectEVGAAmpereGPUControllers() */ + +REGISTER_I2C_DETECTOR("EVGA Ampere GPU", DetectEVGAAmpereGPUControllers); diff --git a/Controllers/EVGAGPUController/EVGAGPUv3Controller.cpp b/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.cpp similarity index 100% rename from Controllers/EVGAGPUController/EVGAGPUv3Controller.cpp rename to Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.cpp diff --git a/Controllers/EVGAGPUController/EVGAGPUv3Controller.h b/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.h similarity index 97% rename from Controllers/EVGAGPUController/EVGAGPUv3Controller.h rename to Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.h index 06355189..bbd30931 100644 --- a/Controllers/EVGAGPUController/EVGAGPUv3Controller.h +++ b/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.h @@ -10,7 +10,6 @@ #include #include "i2c_smbus.h" #include "RGBController.h" -#include "EVGAGPUCommon.h" #pragma once @@ -23,6 +22,16 @@ typedef unsigned char evga_dev_id; #define EVGAGPUV3_INIT 0xFF #define EVGAGPUV3_CONTROLLER_NAME "EVGAv3" +union u16_to_u8 +{ + uint16_t u16; + struct + { + uint8_t LSB; + uint8_t MSB; + }; +}; + struct EVGAv3_config { uint8_t brightness; diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv3.cpp b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp similarity index 100% rename from Controllers/EVGAGPUController/RGBController_EVGAGPUv3.cpp rename to Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv3.h b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.h similarity index 100% rename from Controllers/EVGAGPUController/RGBController_EVGAGPUv3.h rename to Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.h diff --git a/Controllers/EVGAGPUController/EVGAGP102Controller.cpp b/Controllers/EVGAGP102GPUController/EVGAGP102Controller.cpp similarity index 100% rename from Controllers/EVGAGPUController/EVGAGP102Controller.cpp rename to Controllers/EVGAGP102GPUController/EVGAGP102Controller.cpp diff --git a/Controllers/EVGAGPUController/EVGAGP102Controller.h b/Controllers/EVGAGP102GPUController/EVGAGP102Controller.h similarity index 100% rename from Controllers/EVGAGPUController/EVGAGP102Controller.h rename to Controllers/EVGAGP102GPUController/EVGAGP102Controller.h diff --git a/Controllers/EVGAGP102GPUController/EVGAGP102GPUControllerDetect.cpp b/Controllers/EVGAGP102GPUController/EVGAGP102GPUControllerDetect.cpp new file mode 100644 index 00000000..b8e3615c --- /dev/null +++ b/Controllers/EVGAGP102GPUController/EVGAGP102GPUControllerDetect.cpp @@ -0,0 +1,88 @@ +#include "Detector.h" +#include "EVGAGP102Controller.h" +#include "LogManager.h" +#include "RGBController.h" +#include "RGBController_EVGAGP102.h" +#include "i2c_smbus.h" +#include "pci_ids.h" +#include +#include +#include + + +typedef struct +{ + int pci_vendor; + int pci_device; + int pci_subsystem_vendor; + int pci_subsystem_device; + const char * name; +} gpu_pci_device; + +#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ])) + +static const gpu_pci_device device_list[] = +{ + + { NVIDIA_VEN, NVIDIA_GTX1070_DEV, EVGA_SUB_VEN, EVGA_GTX1070_FTW2_SUB_DEV, "EVGA GeForce GTX 1070 FTW2 Gaming" }, + { NVIDIA_VEN, NVIDIA_GTX1080_DEV, EVGA_SUB_VEN, EVGA_GTX1080_FTW2_SUB_DEV, "EVGA GeForce GTX 1080 FTW2" }, + { NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, EVGA_SUB_VEN, EVGA_GTX1080TI_SC2_GAMING_SUB_DEV, "EVGA GTX 1080 Ti SC2 Gaming" }, + { NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, EVGA_SUB_VEN, EVGA_GTX1080TI_FTW3_SUB_DEV, "EVGA GTX 1080 Ti FTW3" }, + { NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, EVGA_SUB_VEN, EVGA_GTX1080TI_FTW3_HYBRID_SUB_DEV, "EVGA 1080Ti FTW3 Hybrid" }, + { NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, EVGA_SUB_VEN, EVGA_GTX1080TI_KINGPIN_SUB_DEV, "EVGA GTX 1080 Ti K|NGP|N" }, + }; +/******************************************************************************************\ +* * +* DetectEVGAGP102GPUControllers * +* * +* Detect EVGA GP102 GPU controllers on the enumerated I2C busses at address 0x49. * +* * +* bus - pointer to i2c_smbus_interface where EVGA GPU device is connected * +* dev - I2C address of EVGA GPU device * +* * +\******************************************************************************************/ + +void DetectEVGAGP102GPUControllers(std::vector& busses) +{ + for (unsigned int bus = 0; bus < busses.size(); bus++) + { + for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++) + { + if (busses[bus]->port_id != 1) + { + break; + } + + if(busses[bus]->pci_vendor == device_list[dev_idx].pci_vendor && + busses[bus]->pci_device == device_list[dev_idx].pci_device && + busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor && + busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device) + { + LOG_DEBUG(GPU_DETECT_MESSAGE, EVGA_GP102_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); + RGBController_EVGAGP102* new_rgbcontroller; + std::vector controllers; + + for(unsigned int i = 0; i < sizeof(gpuzoneinfos) / sizeof(zoneinfo); i++) + { + EVGAGP102Controller* contr = new EVGAGP102Controller(busses[bus], gpuzoneinfos[i]); + if (contr->IsValid()) + { + controllers.push_back(contr); + } + else + { + delete contr; + } + } + if(controllers.size() != 0) + { + new_rgbcontroller = new RGBController_EVGAGP102(controllers); + new_rgbcontroller->name = device_list[dev_idx].name; + ResourceManager::get()->RegisterRGBController(new_rgbcontroller); + } + } + } + } +} /* DetectEVGAGP102GPUControllers() */ + +REGISTER_I2C_DETECTOR("EVGA GP102 GPU", DetectEVGAGP102GPUControllers); diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGP102.cpp b/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp similarity index 100% rename from Controllers/EVGAGPUController/RGBController_EVGAGP102.cpp rename to Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGP102.h b/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.h similarity index 100% rename from Controllers/EVGAGPUController/RGBController_EVGAGP102.h rename to Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.h diff --git a/Controllers/EVGAGPUController/EVGAGPUCommon.h b/Controllers/EVGAGPUController/EVGAGPUCommon.h deleted file mode 100644 index 992b9ae8..00000000 --- a/Controllers/EVGAGPUController/EVGAGPUCommon.h +++ /dev/null @@ -1,19 +0,0 @@ -/*-------------------------------------------------------------------*\ -| EVGAGPUCommon.h | -| | -| Common classes and functions for EVGA GPUs | -| | -| Chris M (Dr_No) 11th July 2021 | -\*-------------------------------------------------------------------*/ - -#pragma once - -union u16_to_u8 -{ - uint16_t u16; - struct - { - uint8_t LSB; - uint8_t MSB; - }; -}; \ No newline at end of file diff --git a/Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp b/Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp deleted file mode 100644 index cee584b1..00000000 --- a/Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp +++ /dev/null @@ -1,226 +0,0 @@ -#include "Detector.h" -#include "EVGAGPUCommon.h" -#include "EVGAGP102Controller.h" -#include "EVGAGPUv1Controller.h" -#include "EVGAGPUv2Controller.h" -#include "EVGAGPUv3Controller.h" -#include "LogManager.h" -#include "RGBController.h" -#include "RGBController_EVGAGP102.h" -#include "RGBController_EVGAGPUv1.h" -#include "RGBController_EVGAGPUv2.h" -#include "RGBController_EVGAGPUv3.h" -#include "i2c_smbus.h" -#include "pci_ids.h" -#include -#include -#include - -enum -{ - EVGA_RGB_GP102, - EVGA_RGB_V1, - EVGA_RGB_V2, - EVGA_RGB_V3, -}; - -typedef struct -{ - int pci_vendor; - int pci_device; - int pci_subsystem_vendor; - int pci_subsystem_device; - int gpu_rgb_version; - const char * name; -} gpu_pci_device; - -#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ])) - -static const gpu_pci_device device_list[] = -{ - { NVIDIA_VEN, NVIDIA_GTX1070_DEV, EVGA_SUB_VEN, EVGA_GTX1070_FTW_DT_GAMING_SUB_DEV, EVGA_RGB_V1, "EVGA GeForce GTX 1070 FTW DT Gaming" }, - { NVIDIA_VEN, NVIDIA_GTX1070_DEV, EVGA_SUB_VEN, EVGA_GTX1070_FTW_SUB_DEV, EVGA_RGB_V1, "EVGA GeForce GTX 1070 FTW" }, - { NVIDIA_VEN, NVIDIA_GTX1070_DEV, EVGA_SUB_VEN, EVGA_GTX1070_FTW_HYBRID_SUB_DEV, EVGA_RGB_V1, "EVGA GeForce GTX 1070 FTW HYBRID" }, - { NVIDIA_VEN, NVIDIA_GTX1070_DEV, EVGA_SUB_VEN, EVGA_GTX1070_FTW2_SUB_DEV, EVGA_RGB_GP102, "EVGA GeForce GTX 1070 FTW2 Gaming" }, - { NVIDIA_VEN, NVIDIA_GTX1070TI_DEV, EVGA_SUB_VEN, EVGA_GTX1070TI_FTW2_SUB_DEV, EVGA_RGB_V1, "EVGA GeForce GTX 1070 Ti FTW2" }, - { NVIDIA_VEN, NVIDIA_GTX1080_DEV, EVGA_SUB_VEN, EVGA_GTX1080_FTW_SUB_DEV, EVGA_RGB_V1, "EVGA GeForce GTX 1080 FTW" }, - { NVIDIA_VEN, NVIDIA_GTX1080_DEV, EVGA_SUB_VEN, EVGA_GTX1080_FTW2_SUB_DEV, EVGA_RGB_GP102, "EVGA GeForce GTX 1080 FTW2" }, - { NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, EVGA_SUB_VEN, EVGA_GTX1080TI_SC2_GAMING_SUB_DEV, EVGA_RGB_GP102, "EVGA GTX 1080 Ti SC2 Gaming" }, - { NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, EVGA_SUB_VEN, EVGA_GTX1080TI_FTW3_SUB_DEV, EVGA_RGB_GP102, "EVGA GTX 1080 Ti FTW3" }, - { NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, EVGA_SUB_VEN, EVGA_GTX1080TI_FTW3_HYBRID_SUB_DEV, EVGA_RGB_GP102, "EVGA 1080Ti FTW3 Hybrid" }, - { NVIDIA_VEN, NVIDIA_GTX1080TI_DEV, EVGA_SUB_VEN, EVGA_GTX1080TI_KINGPIN_SUB_DEV, EVGA_RGB_GP102, "EVGA GTX 1080 Ti K|NGP|N" }, - { NVIDIA_VEN, NVIDIA_RTX2070_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070_XC_GAMING_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2070 XC Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX2070_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070_XC_OC_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2070 XC OC" }, - { NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070S_BLACK_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2070 SUPER Black" }, - { NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070S_XC_ULTRA_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2070 SUPER XC Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070S_XC_ULTRA_PLUS_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2070 SUPER XC Ultra+" }, - { NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070S_FTW3_ULTRA_PLUS_OC_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2070 SUPER FTW3 Ultra+" }, - { NVIDIA_VEN, NVIDIA_RTX2080_DEV, EVGA_SUB_VEN, EVGA_RTX2080_BLACK_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 Black" }, - { NVIDIA_VEN, NVIDIA_RTX2080_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080_XC_BLACK_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 XC Black" }, - { NVIDIA_VEN, NVIDIA_RTX2080_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080_XC_GAMING_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 XC Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX2080_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080_XC_ULTRA_GAMING_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 XC Ultra Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_XC_GAMING_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 SUPER XC Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_XC_ULTRA_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 SUPER XC Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_FTW3_ULTRA_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 SUPER FTW3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_FTW3_HYBRID_OC_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 SUPER FTW3 Hybrid OC" }, - { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_FTW3_ULTRA_HC_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080 SUPER FTW3 Ultra Hydro Copper" }, - { NVIDIA_VEN, NVIDIA_RTX2080TI_DEV, EVGA_SUB_VEN, EVGA_RTX2080TI_BLACK_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080Ti Black" }, - { NVIDIA_VEN, NVIDIA_RTX2080TI_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080TI_XC_ULTRA_GAMING_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080Ti XC Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX2080TI_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080TI_XC_HYBRID_GAMING_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080Ti XC HYBRID GAMING" }, - { NVIDIA_VEN, NVIDIA_RTX2080TI_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080TI_FTW3_ULTRA_SUB_DEV, EVGA_RGB_V2, "EVGA GeForce RTX 2080Ti FTW3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3060TI_DEV, EVGA_SUB_VEN, EVGA_RTX3060TI_FTW3_GAMING_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3060TI FTW3 Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX3060TI_DEV, EVGA_SUB_VEN, EVGA_RTX3060TI_FTW3_ULTRA_KL_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3060TI FTW3 Ultra LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3060TI_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3060TI_FTW3_ULTRA_KL_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3060TI FTW3 Ultra LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3070_DEV, EVGA_SUB_VEN, EVGA_RTX3070_XC3_BLACK_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070 Black Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX3070_DEV, EVGA_SUB_VEN, EVGA_RTX3070_XC3_GAMING_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070 XC3 Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX3070_DEV, EVGA_SUB_VEN, EVGA_RTX3070_XC3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070 XC3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3070_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3070_XC3_ULTRA_LHR_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070 XC3 Ultra LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3070_DEV, EVGA_SUB_VEN, EVGA_RTX3070_FTW3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070 FTW3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3070_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3070_FTW3_ULTRA_LHR_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070 FTW3 Ultra LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3070TI_DEV, EVGA_SUB_VEN, EVGA_RTX3070TI_XC3_GAMING_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070Ti XC3 Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX3070TI_DEV, EVGA_SUB_VEN, EVGA_RTX3070TI_XC3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070Ti XC3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3070TI_DEV, EVGA_SUB_VEN, EVGA_RTX3070TI_FTW3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3070Ti FTW3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_BLACK_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Black" }, - { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_BLACK_LHR_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Black LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_GAMING_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_GAMING_LHR_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Gaming LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_LHR_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Ultra LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_HYBRID_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Ultra Hybrid" }, - { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_HYBRID_LHR_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Ultra Hybrid LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_XC3_ULTRA_HC_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 XC3 Ultra Hydro Copper" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_GAMING_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 FTW3 Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 FTW3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3080_12G_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_12G_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 FTW3 Ultra 12GB" }, - { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_LHR_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 FTW3 Ultra LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_HYBRID_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 FTW3 Ultra Hybrid" }, - { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_HYBRID_LHR_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 FTW3 Ultra Hybrid LHR" }, - { NVIDIA_VEN, NVIDIA_RTX3080_DEV, EVGA_SUB_VEN, EVGA_RTX3080_FTW3_ULTRA_HC_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080 FTW3 Ultra Hydro Copper" }, - { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_XC3_GAMING_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080Ti XC3 Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_XC3_GAMING_HYBRID_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080Ti XC3 Gaming Hybrid" }, - { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_XC3_GAMING_HC_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080Ti XC3 Gaming Hydro Copper" }, - { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_FTW3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080Ti FTW3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_FTW3_ULTRA_HYBRID_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080Ti FTW3 Ultra Hybrid" }, - { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, EVGA_SUB_VEN, EVGA_RTX3080TI_FTW3_ULTRA_HC_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3080Ti FTW3 Ultra Hydro Copper" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_BLACK_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 XC3 Black" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_GAMING_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 XC3 Gaming" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 XC3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_ULTRA_HYBRID_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 XC3 Ultra Hybrid" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_XC3_ULTRA_HC_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 XC3 Ultra Hydro Copper" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_FTW3_ULTRA_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 FTW3 Ultra" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_FTW3_ULTRA_V2_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 FTW3 Ultra v2" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_FTW3_ULTRA_HYBRID_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 FTW3 Ultra Hybrid" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_FTW3_ULTRA_HC_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 FTW3 Ultra Hydro Copper" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_KINGPIN_HYBRID_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 K|NGP|N Hybrid" }, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, EVGA_SUB_VEN, EVGA_RTX3090_KINGPIN_HC_SUB_DEV, EVGA_RGB_V3, "EVGA GeForce RTX 3090 K|NGP|N Hydro Copper" }, -}; -/******************************************************************************************\ -* * -* DetectEVGAGPUControllers * -* * -* Detect EVGA GPU controllers on the enumerated I2C busses at address 0x49. * -* * -* bus - pointer to i2c_smbus_interface where EVGA GPU device is connected * -* dev - I2C address of EVGA GPU device * -* * -\******************************************************************************************/ - -void DetectEVGAGPUControllers(std::vector& busses) -{ - for (unsigned int bus = 0; bus < busses.size(); bus++) - { - for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++) - { - if (busses[bus]->port_id != 1) - { - break; - } - - if(busses[bus]->pci_vendor == device_list[dev_idx].pci_vendor && - busses[bus]->pci_device == device_list[dev_idx].pci_device && - busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor && - busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device) - { - switch(device_list[dev_idx].gpu_rgb_version) - { - case EVGA_RGB_V1: - { - LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV1_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); - EVGAGPUv1Controller* new_controller; - RGBController_EVGAGPUv1* new_rgbcontroller; - - new_controller = new EVGAGPUv1Controller(busses[bus], 0x49); - new_rgbcontroller = new RGBController_EVGAGPUv1(new_controller); - new_rgbcontroller->name = device_list[dev_idx].name; - ResourceManager::get()->RegisterRGBController(new_rgbcontroller); - } - break; - - case EVGA_RGB_V2: - { - LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV2_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); - EVGAGPUv2Controller* new_controller; - RGBController_EVGAGPUv2* new_rgbcontroller; - - new_controller = new EVGAGPUv2Controller(busses[bus], 0x49); - new_rgbcontroller = new RGBController_EVGAGPUv2(new_controller); - new_rgbcontroller->name = device_list[dev_idx].name; - ResourceManager::get()->RegisterRGBController(new_rgbcontroller); - } - break; - - case EVGA_RGB_V3: - { - LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV3_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); - EVGAGPUv3Controller* new_controller; - RGBController_EVGAGPUv3* new_rgbcontroller; - - new_controller = new EVGAGPUv3Controller(busses[bus], 0x2D); - new_controller-> evgaGPUName = device_list[dev_idx].name; // Pass name of the card into the controller for logging. - - if(new_controller-> ReadFWVersion() != "") - { - new_rgbcontroller = new RGBController_EVGAGPUv3(new_controller); - new_rgbcontroller->name = device_list[dev_idx].name; - ResourceManager::get()->RegisterRGBController(new_rgbcontroller); - } - else - { - LOG_INFO("[%s] Failed to get a valid FW version, does the i2c interface support `i2c_smbus_read_i2c_block_data`?", new_controller-> evgaGPUName); - delete new_controller; - } - } - break; - case EVGA_RGB_GP102: - { - LOG_DEBUG(GPU_DETECT_MESSAGE, EVGA_GP102_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); - RGBController_EVGAGP102* new_rgbcontroller; - std::vector controllers; - - for(unsigned int i = 0; i < sizeof(gpuzoneinfos) / sizeof(zoneinfo); i++) - { - EVGAGP102Controller* contr = new EVGAGP102Controller(busses[bus], gpuzoneinfos[i]); - if (contr->IsValid()) - { - controllers.push_back(contr); - } - else - { - delete contr; - } - } - if(controllers.size() != 0) - { - new_rgbcontroller = new RGBController_EVGAGP102(controllers); - new_rgbcontroller->name = device_list[dev_idx].name; - ResourceManager::get()->RegisterRGBController(new_rgbcontroller); - } - } - break; - } - } - } - } -} /* DetectEVGAGPUControllers() */ - -REGISTER_I2C_DETECTOR("EVGA GPU", DetectEVGAGPUControllers); diff --git a/Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp b/Controllers/EVGAPascalGPUController/EVGAGPUv1Controller.cpp similarity index 100% rename from Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp rename to Controllers/EVGAPascalGPUController/EVGAGPUv1Controller.cpp diff --git a/Controllers/EVGAGPUController/EVGAGPUv1Controller.h b/Controllers/EVGAPascalGPUController/EVGAGPUv1Controller.h similarity index 100% rename from Controllers/EVGAGPUController/EVGAGPUv1Controller.h rename to Controllers/EVGAPascalGPUController/EVGAGPUv1Controller.h diff --git a/Controllers/EVGAPascalGPUController/EVGAPascalGPUControllerDetect.cpp b/Controllers/EVGAPascalGPUController/EVGAPascalGPUControllerDetect.cpp new file mode 100644 index 00000000..05128e89 --- /dev/null +++ b/Controllers/EVGAPascalGPUController/EVGAPascalGPUControllerDetect.cpp @@ -0,0 +1,71 @@ +#include "Detector.h" +#include "EVGAGPUv1Controller.h" +#include "LogManager.h" +#include "RGBController.h" +#include "RGBController_EVGAGPUv1.h" +#include "i2c_smbus.h" +#include "pci_ids.h" +#include +#include +#include + +typedef struct +{ + int pci_vendor; + int pci_device; + int pci_subsystem_vendor; + int pci_subsystem_device; + const char * name; +} gpu_pci_device; + +#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ])) + +static const gpu_pci_device device_list[] = +{ + { NVIDIA_VEN, NVIDIA_GTX1070_DEV, EVGA_SUB_VEN, EVGA_GTX1070_FTW_DT_GAMING_SUB_DEV, "EVGA GeForce GTX 1070 FTW DT Gaming" }, + { NVIDIA_VEN, NVIDIA_GTX1070_DEV, EVGA_SUB_VEN, EVGA_GTX1070_FTW_SUB_DEV, "EVGA GeForce GTX 1070 FTW" }, + { NVIDIA_VEN, NVIDIA_GTX1070_DEV, EVGA_SUB_VEN, EVGA_GTX1070_FTW_HYBRID_SUB_DEV, "EVGA GeForce GTX 1070 FTW HYBRID" }, + { NVIDIA_VEN, NVIDIA_GTX1070TI_DEV, EVGA_SUB_VEN, EVGA_GTX1070TI_FTW2_SUB_DEV, "EVGA GeForce GTX 1070 Ti FTW2" }, + { NVIDIA_VEN, NVIDIA_GTX1080_DEV, EVGA_SUB_VEN, EVGA_GTX1080_FTW_SUB_DEV, "EVGA GeForce GTX 1080 FTW" }, +}; +/******************************************************************************************\ +* * +* DetectEVGAGPUControllers * +* * +* Detect EVGA Pascal GPU controllers on the enumerated I2C busses at address 0x49. * +* * +* bus - pointer to i2c_smbus_interface where EVGA GPU device is connected * +* dev - I2C address of EVGA GPU device * +* * +\******************************************************************************************/ + +void DetectEVGAPascalGPUControllers(std::vector& busses) +{ + for (unsigned int bus = 0; bus < busses.size(); bus++) + { + for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++) + { + if (busses[bus]->port_id != 1) + { + break; + } + + if(busses[bus]->pci_vendor == device_list[dev_idx].pci_vendor && + busses[bus]->pci_device == device_list[dev_idx].pci_device && + busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor && + busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device) + { + LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV1_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); + EVGAGPUv1Controller* new_controller; + RGBController_EVGAGPUv1* new_rgbcontroller; + + new_controller = new EVGAGPUv1Controller(busses[bus], 0x49); + new_rgbcontroller = new RGBController_EVGAGPUv1(new_controller); + new_rgbcontroller->name = device_list[dev_idx].name; + ResourceManager::get()->RegisterRGBController(new_rgbcontroller); + } + } + } +} /* DetectEVGAPascalGPUControllers() */ + +REGISTER_I2C_DETECTOR("EVGA Pascal GPU", DetectEVGAPascalGPUControllers); diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp b/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp similarity index 100% rename from Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp rename to Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h b/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.h similarity index 100% rename from Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h rename to Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.h diff --git a/Controllers/EVGAGPUController/EVGAGPUv2Controller.cpp b/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.cpp similarity index 100% rename from Controllers/EVGAGPUController/EVGAGPUv2Controller.cpp rename to Controllers/EVGATuringGPUController/EVGAGPUv2Controller.cpp diff --git a/Controllers/EVGAGPUController/EVGAGPUv2Controller.h b/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.h similarity index 97% rename from Controllers/EVGAGPUController/EVGAGPUv2Controller.h rename to Controllers/EVGATuringGPUController/EVGAGPUv2Controller.h index 23c219a3..fba55feb 100644 --- a/Controllers/EVGAGPUController/EVGAGPUv2Controller.h +++ b/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.h @@ -10,7 +10,6 @@ #include #include "i2c_smbus.h" #include "RGBController.h" -#include "EVGAGPUCommon.h" #pragma once @@ -22,6 +21,16 @@ typedef unsigned char evga_dev_id; #define EVGA_GPU_V2_BRIGHTNESS_MAX 0x64 #define EVGAGPUV2_CONTROLLER_NAME "EVGAv2" +union u16_to_u8 +{ + uint16_t u16; + struct + { + uint8_t LSB; + uint8_t MSB; + }; +}; + enum { EVGA_GPU_V2_REG_MODE = 0x60, diff --git a/Controllers/EVGATuringGPUController/EVGATuringGPUControllerDetect.cpp b/Controllers/EVGATuringGPUController/EVGATuringGPUControllerDetect.cpp new file mode 100644 index 00000000..07586fb2 --- /dev/null +++ b/Controllers/EVGATuringGPUController/EVGATuringGPUControllerDetect.cpp @@ -0,0 +1,85 @@ +#include "Detector.h" +#include "EVGAGPUv2Controller.h" +#include "LogManager.h" +#include "RGBController.h" +#include "RGBController_EVGAGPUv2.h" +#include "i2c_smbus.h" +#include "pci_ids.h" +#include +#include +#include + +typedef struct +{ + int pci_vendor; + int pci_device; + int pci_subsystem_vendor; + int pci_subsystem_device; + const char * name; +} gpu_pci_device; + +#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ])) + +static const gpu_pci_device device_list[] = +{ + { NVIDIA_VEN, NVIDIA_RTX2070_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070_XC_GAMING_SUB_DEV, "EVGA GeForce RTX 2070 XC Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX2070_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070_XC_OC_SUB_DEV, "EVGA GeForce RTX 2070 XC OC" }, + { NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070S_BLACK_SUB_DEV, "EVGA GeForce RTX 2070 SUPER Black" }, + { NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070S_XC_ULTRA_SUB_DEV, "EVGA GeForce RTX 2070 SUPER XC Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070S_XC_ULTRA_PLUS_SUB_DEV, "EVGA GeForce RTX 2070 SUPER XC Ultra+" }, + { NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, EVGA_SUB_VEN, EVGA_RTX2070S_FTW3_ULTRA_PLUS_OC_SUB_DEV, "EVGA GeForce RTX 2070 SUPER FTW3 Ultra+" }, + { NVIDIA_VEN, NVIDIA_RTX2080_DEV, EVGA_SUB_VEN, EVGA_RTX2080_BLACK_SUB_DEV, "EVGA GeForce RTX 2080 Black" }, + { NVIDIA_VEN, NVIDIA_RTX2080_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080_XC_BLACK_SUB_DEV, "EVGA GeForce RTX 2080 XC Black" }, + { NVIDIA_VEN, NVIDIA_RTX2080_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080_XC_GAMING_SUB_DEV, "EVGA GeForce RTX 2080 XC Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX2080_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080_XC_ULTRA_GAMING_SUB_DEV, "EVGA GeForce RTX 2080 XC Ultra Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_XC_GAMING_SUB_DEV, "EVGA GeForce RTX 2080 SUPER XC Gaming" }, + { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_XC_ULTRA_SUB_DEV, "EVGA GeForce RTX 2080 SUPER XC Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_FTW3_ULTRA_SUB_DEV, "EVGA GeForce RTX 2080 SUPER FTW3 Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_FTW3_HYBRID_OC_SUB_DEV, "EVGA GeForce RTX 2080 SUPER FTW3 Hybrid OC" }, + { NVIDIA_VEN, NVIDIA_RTX2080S_DEV, EVGA_SUB_VEN, EVGA_RTX2080S_FTW3_ULTRA_HC_SUB_DEV, "EVGA GeForce RTX 2080 SUPER FTW3 Ultra Hydro Copper" }, + { NVIDIA_VEN, NVIDIA_RTX2080TI_DEV, EVGA_SUB_VEN, EVGA_RTX2080TI_BLACK_SUB_DEV, "EVGA GeForce RTX 2080Ti Black" }, + { NVIDIA_VEN, NVIDIA_RTX2080TI_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080TI_XC_ULTRA_GAMING_SUB_DEV, "EVGA GeForce RTX 2080Ti XC Ultra" }, + { NVIDIA_VEN, NVIDIA_RTX2080TI_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080TI_XC_HYBRID_GAMING_SUB_DEV, "EVGA GeForce RTX 2080Ti XC HYBRID GAMING" }, + { NVIDIA_VEN, NVIDIA_RTX2080TI_A_DEV, EVGA_SUB_VEN, EVGA_RTX2080TI_FTW3_ULTRA_SUB_DEV, "EVGA GeForce RTX 2080Ti FTW3 Ultra" }, + }; +/******************************************************************************************\ +* * +* DetectEVGATuringGPUControllers * +* * +* Detect EVGA Turing GPU controllers on the enumerated I2C busses at address 0x49. * +* * +* bus - pointer to i2c_smbus_interface where EVGA GPU device is connected * +* dev - I2C address of EVGA GPU device * +* * +\******************************************************************************************/ + +void DetectEVGATuringGPUControllers(std::vector& busses) +{ + for (unsigned int bus = 0; bus < busses.size(); bus++) + { + for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++) + { + if (busses[bus]->port_id != 1) + { + break; + } + + if(busses[bus]->pci_vendor == device_list[dev_idx].pci_vendor && + busses[bus]->pci_device == device_list[dev_idx].pci_device && + busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor && + busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device) + { + LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV2_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); + EVGAGPUv2Controller* new_controller; + RGBController_EVGAGPUv2* new_rgbcontroller; + + new_controller = new EVGAGPUv2Controller(busses[bus], 0x49); + new_rgbcontroller = new RGBController_EVGAGPUv2(new_controller); + new_rgbcontroller->name = device_list[dev_idx].name; + ResourceManager::get()->RegisterRGBController(new_rgbcontroller); + } + } + } +} /* DetectEVGATuringGPUControllers() */ + +REGISTER_I2C_DETECTOR("EVGA Turing GPU", DetectEVGATuringGPUControllers); diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp similarity index 100% rename from Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp rename to Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.h similarity index 100% rename from Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h rename to Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.h diff --git a/OpenRGB.pro b/OpenRGB.pro index 2c55b6ed..320ed99e 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -100,7 +100,10 @@ INCLUDEPATH += Controllers/ENESMBusController/ \ Controllers/ENESMBusController/ENESMBusInterface \ Controllers/EspurnaController/ \ - Controllers/EVGAGPUController/ \ + Controllers/EVGAGP102GPUController/ \ + Controllers/EVGAPascalGPUController/ \ + Controllers/EVGATuringGPUController/ \ + Controllers/EVGAAmpereGPUController/ \ Controllers/EVisionKeyboardController/ \ Controllers/FanBusController/ \ Controllers/GainwardGPUController/ \ @@ -302,15 +305,14 @@ HEADERS += Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_i2c_smbus.h \ Controllers/EspurnaController/EspurnaController.h \ Controllers/EspurnaController/RGBController_Espurna.h \ - Controllers/EVGAGPUController/EVGAGP102Controller.h \ - Controllers/EVGAGPUController/EVGAGPUCommon.h \ - Controllers/EVGAGPUController/EVGAGPUv1Controller.h \ - Controllers/EVGAGPUController/EVGAGPUv2Controller.h \ - Controllers/EVGAGPUController/EVGAGPUv3Controller.h \ - Controllers/EVGAGPUController/RGBController_EVGAGP102.h \ - Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h \ - Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h \ - Controllers/EVGAGPUController/RGBController_EVGAGPUv3.h \ + Controllers/EVGAGP102GPUController/EVGAGP102Controller.h \ + Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.h \ + Controllers/EVGAPascalGPUController/EVGAGPUv1Controller.h \ + Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.h \ + Controllers/EVGATuringGPUController/EVGAGPUv2Controller.h \ + Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.h \ + Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.h \ + Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.h \ Controllers/EVisionKeyboardController/EVisionKeyboardController.h \ Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.h \ Controllers/FanBusController/FanBusController.h \ @@ -701,15 +703,18 @@ SOURCES += Controllers/EspurnaController/EspurnaController.cpp \ Controllers/EspurnaController/EspurnaControllerDetect.cpp \ Controllers/EspurnaController/RGBController_Espurna.cpp \ - Controllers/EVGAGPUController/EVGAGP102Controller.cpp \ - Controllers/EVGAGPUController/EVGAGPUv1Controller.cpp \ - Controllers/EVGAGPUController/EVGAGPUv2Controller.cpp \ - Controllers/EVGAGPUController/EVGAGPUv3Controller.cpp \ - Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp \ - Controllers/EVGAGPUController/RGBController_EVGAGP102.cpp \ - Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp \ - Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp \ - Controllers/EVGAGPUController/RGBController_EVGAGPUv3.cpp \ + Controllers/EVGAGP102GPUController/EVGAGP102Controller.cpp \ + Controllers/EVGAGP102GPUController/EVGAGP102GPUControllerDetect.cpp \ + Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp \ + Controllers/EVGAPascalGPUController/EVGAGPUv1Controller.cpp \ + Controllers/EVGAPascalGPUController/EVGAPascalGPUControllerDetect.cpp \ + Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp \ + Controllers/EVGATuringGPUController/EVGAGPUv2Controller.cpp \ + Controllers/EVGATuringGPUController/EVGATuringGPUControllerDetect.cpp \ + Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp \ + Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.cpp \ + Controllers/EVGAAmpereGPUController/EVGAAmpereGPUControllerDetect.cpp \ + Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp \ Controllers/EVisionKeyboardController/EVisionKeyboardController.cpp \ Controllers/EVisionKeyboardController/EVisionKeyboardControllerDetect.cpp \ Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp \