jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SapphireGPUController: Implement Nitro Glow V3

Browse source 
Commit amended for code style and to squash commits by Adam Honse <calcprogrammer1@gmail.com>
This commit is contained in:
K900 2021-02-01 20:49:55 +03:00 • committed by Adam Honse
parent 50219f231a
commit f7756c003f
15 changed files with 573 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Controllers/SapphireGPUController/SapphireGPUControllerDetect.cpp
View file

@ -1,12 +1,31 @@
#include "Detector.h"
#include "SapphireGPUController.h"
#include "RGBController.h"
#include "RGBController_SapphireGPU.h"
#include "SapphireNitroGlowV1Controller.h"
#include "SapphireNitroGlowV3Controller.h"
#include "RGBController_SapphireNitroGlowV1.h"
#include "RGBController_SapphireNitroGlowV3.h"
#include "i2c_smbus.h"
#include "pci_ids.h"
#include <vector>
#include <stdio.h>
#include <stdlib.h>
/*-----------------------------------------------------*\
| I2C Addresses for Sapphire Nitro Glow RGB |
\*-----------------------------------------------------*/
enum
{
SAPPHIRE_NITRO_GLOW_V1_ADDR = 0x55,
SAPPHIRE_NITRO_GLOW_V3_ADDR = 0x28,
};
/*-----------------------------------------------------*\
| Nitro Glow Versions |
\*-----------------------------------------------------*/
enum
{
SAPPHIRE_NITRO_GLOW_V1,
SAPPHIRE_NITRO_GLOW_V2,
SAPPHIRE_NITRO_GLOW_V3,
};
typedef struct
{
@ -14,6 +33,7 @@ typedef struct
int pci_device;
int pci_subsystem_vendor;
int pci_subsystem_device;
int version;
const char * name;
} gpu_pci_device;
@ -21,7 +41,18 @@ typedef struct
static const gpu_pci_device device_list[] =
{
{ AMD_GPU_VEN, AMD_RX580_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_RX580_NITRO_PLUS_SUB_DEV, "Sapphire RX580 Nitro+" },
{ AMD_GPU_VEN, AMD_POLARIS_DEV, SAPPHIRE_LEGACY_SUB_VEN, SAPPHIRE_LEGACY_POLARIS_NITRO_PLUS_SUB_DEV, SAPPHIRE_NITRO_GLOW_V1, "RX 470/480 Nitro+" },
{ AMD_GPU_VEN, AMD_POLARIS_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_POLARIS_NITRO_PLUS_SUB_DEV1, SAPPHIRE_NITRO_GLOW_V1, "RX 570/580/590 Nitro+" },
{ AMD_GPU_VEN, AMD_POLARIS_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_POLARIS_NITRO_PLUS_SUB_DEV2, SAPPHIRE_NITRO_GLOW_V1, "RX 570/580/590 Nitro+" },
{ AMD_GPU_VEN, AMD_POLARIS20XL_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_POLARIS_NITRO_PLUS_SUB_DEV1, SAPPHIRE_NITRO_GLOW_V1, "RX 580 Nitro+ (2048SP)" },
{ AMD_GPU_VEN, AMD_VEGA10_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_VEGA10_NITRO_PLUS_SUB_DEV, SAPPHIRE_NITRO_GLOW_V1, "RX Vega 56/64 Nitro+" },
{ AMD_GPU_VEN, AMD_NAVI10_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_NAVI10_NITRO_PLUS_SUB_DEV1, SAPPHIRE_NITRO_GLOW_V3, "RX 5700 (XT) Nitro+" },
{ AMD_GPU_VEN, AMD_NAVI10_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_NAVI10_NITRO_PLUS_SUB_DEV2, SAPPHIRE_NITRO_GLOW_V3, "RX 5700 XT Nitro+" },
{ AMD_GPU_VEN, AMD_NAVI10_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_NAVI10_NITRO_PLUS_SUB_DEV3, SAPPHIRE_NITRO_GLOW_V3, "RX 5700 XT Nitro+" },
{ AMD_GPU_VEN, AMD_NAVI14_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_NAVI14_NITRO_PLUS_SUB_DEV, SAPPHIRE_NITRO_GLOW_V3, "RX 5500 XT Nitro+" },
{ AMD_GPU_VEN, AMD_NAVI21_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_NAVI21_NITRO_PLUS_SUB_DEV1, SAPPHIRE_NITRO_GLOW_V3, "RX 6800 XT Nitro+ SE" },
{ AMD_GPU_VEN, AMD_NAVI21_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_NAVI21_NITRO_PLUS_SUB_DEV2, SAPPHIRE_NITRO_GLOW_V3, "RX 6800 XT/6900 XT Nitro+" },
{ AMD_GPU_VEN, AMD_NAVI21_DEV, SAPPHIRE_SUB_VEN, SAPPHIRE_NAVI21_NITRO_PLUS_SUB_DEV3, SAPPHIRE_NITRO_GLOW_V3, "RX 6800 Nitro+" },
};
/******************************************************************************************\
@ -29,7 +60,7 @@ static const gpu_pci_device device_list[] =
* TestForSapphireGPUController *
* *
* Tests the given address to see if an Sapphire controller exists there. First *
* does a quick write to test for a response *
* does a byte read to test for a response *
* *
\******************************************************************************************/
@ -54,19 +85,13 @@ bool TestForSapphireGPUController(i2c_smbus_interface* bus, unsigned char addres
* *
* DetectSapphireGPUControllers *
* *
* Detect Sapphire GPU controllers on the enumerated I2C busses at address 0x55. *
* *
* bus - pointer to i2c_smbus_interface where Sapphire GPU device is connected *
* dev - I2C address of Sapphire GPU device *
* Detect Sapphire GPU controllers on the enumerated I2C buses. *
* *
\******************************************************************************************/
void DetectSapphireGPUControllers(std::vector<i2c_smbus_interface*>& busses, std::vector<RGBController*>& rgb_controllers)
void DetectSapphireGPUControllers(std::vector<i2c_smbus_interface *> &busses, std::vector<RGBController *> &rgb_controllers)
{
SapphireGPUController* new_sapphire_gpu;
RGBController_SapphireGPU* new_controller;
for (unsigned int bus = 0; bus < busses.size(); bus++)
for(unsigned int bus = 0; bus < busses.size(); bus++)
{
for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++)
{
@ -75,12 +100,29 @@ void DetectSapphireGPUControllers(std::vector<i2c_smbus_interface*>& busses, std
busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
{
if(TestForSapphireGPUController(busses[bus], 0x55))
RGBController *controller;
switch(device_list[dev_idx].version)
{
new_sapphire_gpu = new SapphireGPUController(busses[bus], 0x55);
new_controller = new RGBController_SapphireGPU(new_sapphire_gpu);
new_controller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_controller);
case SAPPHIRE_NITRO_GLOW_V1:
if(TestForSapphireGPUController(busses[bus], SAPPHIRE_NITRO_GLOW_V1_ADDR))
{
SapphireNitroGlowV1Controller* new_sapphire_gpu = new SapphireNitroGlowV1Controller(busses[bus], SAPPHIRE_NITRO_GLOW_V1_ADDR);
RGBController_SapphireNitroGlowV1* new_controller = new RGBController_SapphireNitroGlowV1(new_sapphire_gpu);
new_controller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_controller);
}
break;
case SAPPHIRE_NITRO_GLOW_V3:
if(TestForSapphireGPUController(busses[bus], SAPPHIRE_NITRO_GLOW_V3_ADDR))
{
SapphireNitroGlowV3Controller* new_sapphire_gpu = new SapphireNitroGlowV3Controller(busses[bus], SAPPHIRE_NITRO_GLOW_V3_ADDR);
RGBController_SapphireNitroGlowV3* new_controller = new RGBController_SapphireNitroGlowV3(new_sapphire_gpu);
new_controller->name = device_list[dev_idx].name;
rgb_controllers.push_back(new_controller);
}
break;
}
}
}