IntenseWebs/tuxclocker
3
0
Fork 0
mirror of https://github.com/Lurkki14/tuxclocker.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

use same function as pstates for getting voltage-frequency assignables

Browse Source
This commit is contained in:
Jussi Kuokkanen
2023-11-04 15:55:18 +02:00
parent 016da9a11f
commit 88e5af98bd
1 changed files with 30 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/plugins/AMD.cpp
View File

@@ -26,7 +26,8 @@ using AssignmentFunction = std::function<std::optional<AssignmentError>(Assignme
enum VoltFreqType { enum VoltFreqType {
MemoryPState, MemoryPState,
CorePState CorePState,
CoreVFCurve
}; };
EnumerationVec performanceLevelEnumVec = {{_("Automatic"), 0}, {_("Lowest"), 1}, {_("Highest"), 2}, EnumerationVec performanceLevelEnumVec = {{_("Automatic"), 0}, {_("Lowest"), 1}, {_("Highest"), 2},
@@ -89,6 +90,11 @@ std::optional<Assignable> vfPointClockAssignable(
sectionHeader = "OD_SCLK"; sectionHeader = "OD_SCLK";
break; break;
} }
case CoreVFCurve: {
typeString = "vc";
sectionHeader = "OD_VDDC_CURVE";
break;
}
} }
auto getFunc = [=]() -> std::optional<AssignmentArgument> { auto getFunc = [=]() -> std::optional<AssignmentArgument> {
@@ -156,6 +162,11 @@ std::optional<Assignable> vfPointVoltageAssignable(
sectionHeader = "OD_SCLK"; sectionHeader = "OD_SCLK";
break; break;
} }
case CoreVFCurve: {
typeString = "vc";
sectionHeader = "OD_VDDC_CURVE";
break;
}
} }
auto getFunc = [=]() -> std::optional<AssignmentArgument> { auto getFunc = [=]() -> std::optional<AssignmentArgument> {
@@ -480,52 +491,20 @@ std::vector<TreeNode<DeviceNode>> getVoltFreqFreq(AMDGPUData data) {
// Make a copy so the lambda keeps using the right id // Make a copy so the lambda keeps using the right id
auto id = pointId; auto id = pointId;
auto getFunc = [=]() -> std::optional<AssignmentArgument> {
auto curvePoint = vfPointWithRead("OD_VDDC_CURVE", id, data);
if (!curvePoint.has_value())
return std::nullopt;
return curvePoint->clock;
};
auto setFunc = [=](AssignmentArgument a) -> std::optional<AssignmentError> {
if (!std::holds_alternative<int>(a))
return AssignmentError::InvalidType;
auto target = std::get<int>(a);
if (target < range->min || target > range->max)
return AssignmentError::OutOfRange;
auto curvePoint = vfPointWithRead("OD_VDDC_CURVE", id, data);
if (!curvePoint.has_value())
return AssignmentError::UnknownError;
std::ofstream file{data.hwmonPath + "/pp_od_clk_voltage"};
char cmdString[32];
snprintf(cmdString, 32, "vc %i %i %i", id, target, curvePoint->voltage);
if (file << cmdString && file << "c")
return std::nullopt;
return AssignmentError::UnknownError;
};
auto setWithPerfLevel = [=](AssignmentArgument a) -> std::optional<AssignmentError> {
return withManualPerformanceLevel(setFunc, a, data);
};
Assignable a{setWithPerfLevel, *range, getFunc, _("MHz")};
pointId++; pointId++;
auto assignable = vfPointClockAssignable(CoreVFCurve, id, *range, data);
if (!assignable.has_value())
return {};
// The rest of this code should work the same on Navi and RDNA 3 // The rest of this code should work the same on Navi and RDNA 3
auto name = (*data.ppTableType == Navi) ? _("Core Clock") : _("Core Clock Offset"); auto name = (*data.ppTableType == Navi) ? _("Core Clock") : _("Core Clock Offset");
if (getFunc().has_value()) return {DeviceNode{
return {DeviceNode{ .name = name,
.name = name, .interface = *assignable,
.interface = a, .hash = md5(data.pciId + "VFClock" + std::to_string(id)),
.hash = md5(data.pciId + "VFClock" + std::to_string(id)), }};
}};
return {};
} }
std::vector<TreeNode<DeviceNode>> getVoltFreqVolt(AMDGPUData data) { std::vector<TreeNode<DeviceNode>> getVoltFreqVolt(AMDGPUData data) {
@@ -548,52 +527,20 @@ std::vector<TreeNode<DeviceNode>> getVoltFreqVolt(AMDGPUData data) {
// Make a copy so the lambda keeps using the right id // Make a copy so the lambda keeps using the right id
auto id = pointId; auto id = pointId;
auto getFunc = [=]() -> std::optional<AssignmentArgument> {
auto curvePoint = vfPointWithRead("OD_VDDC_CURVE", id, data);
if (!curvePoint.has_value())
return std::nullopt;
return curvePoint->voltage;
};
auto setFunc = [=](AssignmentArgument a) -> std::optional<AssignmentError> {
if (!std::holds_alternative<int>(a))
return AssignmentError::InvalidType;
auto target = std::get<int>(a);
if (target < range->min || target > range->max)
return AssignmentError::OutOfRange;
auto curvePoint = vfPointWithRead("OD_VDDC_CURVE", id, data);
if (!curvePoint.has_value())
return AssignmentError::UnknownError;
std::ofstream file{data.hwmonPath + "/pp_od_clk_voltage"};
char cmdString[32];
snprintf(cmdString, 32, "vc %i %i %i", id, curvePoint->clock, target);
if (file << cmdString && file << "c")
return std::nullopt;
return AssignmentError::UnknownError;
};
auto setWithPerfLevel = [=](AssignmentArgument a) -> std::optional<AssignmentError> {
return withManualPerformanceLevel(setFunc, a, data);
};
Assignable a{setWithPerfLevel, *range, getFunc, _("mV")};
pointId++; pointId++;
auto assignable = vfPointVoltageAssignable(CoreVFCurve, id, *range, data);
if (!assignable.has_value())
return {};
// The rest of this code should work the same on Navi and RDNA 3 // The rest of this code should work the same on Navi and RDNA 3
auto name = (*data.ppTableType == Navi) ? _("Core Voltage") : _("Core Voltage Offset"); auto name = (*data.ppTableType == Navi) ? _("Core Voltage") : _("Core Voltage Offset");
if (getFunc().has_value()) return {DeviceNode{
return {DeviceNode{ .name = name,
.name = name, .interface = *assignable,
.interface = a, .hash = md5(data.pciId + "VFVoltage" + std::to_string(id)),
.hash = md5(data.pciId + "VFVoltage" + std::to_string(id)), }};
}};
return {};
} }
std::vector<TreeNode<DeviceNode>> getCorePStateFreq(AMDGPUData data) { std::vector<TreeNode<DeviceNode>> getCorePStateFreq(AMDGPUData data) {