mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2025-12-23 23:37:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move correct i2c bus detection for AMD GPUs to separate header file

Browse Source
This commit is contained in:
Michal Malý
2025-08-06 23:16:20 +02:00
parent f5fc3ff450
commit 4e0c09efd4
2 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Controllers/SapphireGPUController/SapphireGPUControllerDetect.cpp
View File

@@ -7,12 +7,12 @@
| SPDX-License-Identifier: GPL-2.0-or-later |
\*---------------------------------------------------------*/
#include <cstring>
#include "Detector.h"
#include "SapphireNitroGlowV1Controller.h"
#include "SapphireNitroGlowV3Controller.h"
#include "RGBController_SapphireNitroGlowV1.h"
#include "RGBController_SapphireNitroGlowV3.h"
#include "i2c_amd_gpu.h"
#include "i2c_smbus.h"
#include "pci_ids.h"
@@ -34,31 +34,9 @@ enum
* *
\******************************************************************************************/
static const char * RECOGNIZED_I2C_BUS_NAMES[] = {
"AMD ADL",
"AMDGPU DM i2c OEM bus",
nullptr
};
bool IsRecognizedI2CBus(i2c_smbus_interface* bus)
{
size_t idx = 0;
const char *name;
while((name = RECOGNIZED_I2C_BUS_NAMES[idx++]) != nullptr)
{
if(std::strcmp(name, bus->device_name) == 0)
{
return true;
}
}
return false;
}
bool TestForSapphireGPUController(i2c_smbus_interface* bus, unsigned char address)
{
if (!IsRecognizedI2CBus(bus))
if(bus->pci_vendor == AMD_GPU_VEN && !is_amd_gpu_i2c_bus(bus))
{
return false;
}

38
i2c_smbus/i2c_amd_gpu.h Normal file
View File

@@ -0,0 +1,38 @@
/*---------------------------------------------------------*\
| i2c_amd_gpu.h |
| |
| Bits specific to AMD GPUs to reliably detect |
| the I2C bus that has RGB control |
| |
| This file is part of the OpenRGB project |
| SPDX-License-Identifier: GPL-2.0-or-later |
\*---------------------------------------------------------*/
#pragma once
#include <cstring>
#include "i2c_smbus.h"
inline constexpr const char * RECOGNIZED_I2C_BUS_NAMES[] =
{
// Windows i2c bus
"AMD ADL",
// Linux i2c bus name since kernel 6.15
"AMDGPU DM i2c OEM bus",
nullptr
};
inline bool is_amd_gpu_i2c_bus(const i2c_smbus_interface *bus)
{
const char *name;
size_t idx = 0;
while((name = RECOGNIZED_I2C_BUS_NAMES[idx++]) != nullptr)
{
if(std::strcmp(name, bus->device_name) == 0)
{
return true;
}
}
return false;
}