From 3414688eb79eeee771a67db91103803114fde252 Mon Sep 17 00:00:00 2001 From: TheRogueZeta <6479694-TheRogueZeta@users.noreply.gitlab.com> Date: Mon, 29 Nov 2021 20:49:55 +0000 Subject: [PATCH] Add Gigabyte Aorus RTX2060S device ID and sort names --- .../GigabyteRGBFusion2GPUControllerDetect.cpp | 21 +++++++++++-------- pci_ids/pci_ids.h | 1 + 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Controllers/GigabyteRGBFusion2GPUController/GigabyteRGBFusion2GPUControllerDetect.cpp b/Controllers/GigabyteRGBFusion2GPUController/GigabyteRGBFusion2GPUControllerDetect.cpp index 1ac37827..0d8dd91c 100644 --- a/Controllers/GigabyteRGBFusion2GPUController/GigabyteRGBFusion2GPUControllerDetect.cpp +++ b/Controllers/GigabyteRGBFusion2GPUController/GigabyteRGBFusion2GPUControllerDetect.cpp @@ -19,18 +19,20 @@ typedef struct const char * name; } gpu_pci_device; -#define GIGABYTEGPU_CONTROLLER_NAME2 "Gigabyte RGB Fusion2 GPU" +#define GIGABYTEGPU_DETECT_MESSAGE "[%s] Found a device match at Bus %02d for Device %04x and SubDevice %04x: %s" +#define GIGABYTEGPU_CONTROLLER_NAME2 "Gigabyte RGB Fusion2 GPU" #define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ])) static const gpu_pci_device device_list[] = { - { NVIDIA_VEN, NVIDIA_RTX3060TI_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3060TI_GAMING_OC_PRO_SUB_DEV, 0x62, "GeForce RTX 3060 Ti GAMING OC PRO 8G" }, - { NVIDIA_VEN, NVIDIA_RTX3060_LHR_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3060_ELITE_12GB_SUB_DEV, 0x70, "GeForce RTX 3060 AORUS ELITE 12G" }, - { NVIDIA_VEN, NVIDIA_RTX3070_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3070_MASTER_OC_SUB_DEV, 0x66, "GeForce RTX 3070 AORUS MASTER 8G" }, - { NVIDIA_VEN, NVIDIA_RTX2070S_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX2070S_GAMING_OC_SUB_DEV2, 0x50, "GeForce RTX 2070 AORUS SUPER 8G" }, - { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3080_XTREME_WATERFORCE_SUB_DEV, 0x64, "GeForce RTX 3080 AORUS XTREME WATERFORCE WB 10G"}, - { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3080TI_XTREME_WATERFORCE_SUB_DEV, 0x65, "GeForce RTX 3080 Ti AORUS XTREME WATERFORCE 12G"}, - { NVIDIA_VEN, NVIDIA_RTX3090_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3090_XTREME_WATERFORCE_SUB_DEV, 0x64, "GeForce RTX 3090 AORUS XTREME WATERFORCE WB 24G"}, + { NVIDIA_VEN, NVIDIA_RTX2060S_OC_DEV, GIGABYTE_SUB_VEN, GIGABYTE_AORUS_RTX2060S_V1_SUB_DEV, 0x50, "Gigabyte AORUS RTX2060 SUPER 8G V1" }, + { NVIDIA_VEN, NVIDIA_RTX2070S_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX2070S_GAMING_OC_SUB_DEV2, 0x50, "Gigabyte AORUS RTX2070 SUPER 8G" }, + { NVIDIA_VEN, NVIDIA_RTX3060_LHR_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3060_ELITE_12GB_SUB_DEV, 0x70, "Gigabyte AORUS RTX3060 ELITE 12G" }, + { NVIDIA_VEN, NVIDIA_RTX3060TI_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3060TI_GAMING_OC_PRO_SUB_DEV, 0x62, "Gigabyte AORUS RTX3060 Ti GAMING OC PRO 8G" }, + { NVIDIA_VEN, NVIDIA_RTX3070_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3070_MASTER_OC_SUB_DEV, 0x66, "Gigabyte RTX3070 MASTER 8G" }, + { NVIDIA_VEN, NVIDIA_RTX3080_LHR_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3080_XTREME_WATERFORCE_SUB_DEV, 0x64, "Gigabyte AORUS RTX3080 XTREME WATERFORCE WB 10G" }, + { NVIDIA_VEN, NVIDIA_RTX3080TI_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3080TI_XTREME_WATERFORCE_SUB_DEV, 0x65, "Gigabyte AORUS RTX3080 Ti XTREME WATERFORCE 12G" }, + { NVIDIA_VEN, NVIDIA_RTX3090_DEV, GIGABYTE_SUB_VEN, GIGABYTE_RTX3090_XTREME_WATERFORCE_SUB_DEV, 0x64, "Gigabyte AORUS RTX3090 XTREME WATERFORCE WB 24G" }, }; /******************************************************************************************\ @@ -66,7 +68,7 @@ bool TestForGigabyteRGBFusion2GPUController(i2c_smbus_interface* bus, unsigned c //GeForce RTX 3080 AORUS XTREME WATERFORCE WB 10G 0xAB 0x10 0x01 0x00 if(res < 0) { - LOG_DEBUG("[%s] at 0x%02X address expected 0x04 but recieved: 0x%02X", GIGABYTEGPU_CONTROLLER_NAME2, address, res); + LOG_DEBUG("[%s] at 0x%02X address expected 0x04 but received: 0x%02X", GIGABYTEGPU_CONTROLLER_NAME2, address, res); pass = false; } @@ -95,6 +97,7 @@ void DetectGigabyteRGBFusion2GPUControllers(std::vector& b 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(GIGABYTEGPU_DETECT_MESSAGE, GIGABYTEGPU_CONTROLLER_NAME2, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name ); // Check for RGB Fusion2 controller if(TestForGigabyteRGBFusion2GPUController(busses[bus], device_list[dev_idx].controller_address)) { diff --git a/pci_ids/pci_ids.h b/pci_ids/pci_ids.h index bbd37314..4a0e6383 100644 --- a/pci_ids/pci_ids.h +++ b/pci_ids/pci_ids.h @@ -259,6 +259,7 @@ #define GIGABYTE_RTX2060S_GAMING_SUB_DEV 0x404A #define GIGABYTE_RTX2060S_GAMING_OC_SUB_DEV 0x3FED #define GIGABYTE_RTX2060S_GAMING_OC_WHITE_SUB_DEV 0x3FFE +#define GIGABYTE_AORUS_RTX2060S_V1_SUB_DEV 0x3FF7 #define GIGABYTE_RTX2070_GAMING_OC_SUB_DEV 0x37AD #define GIGABYTE_RTX2070_WINDFORCE_SUB_DEV 0x37C2 #define GIGABYTE_RTX2070S_GAMING_OC_SUB_DEV 0x3FEB