1 parent
8953cedd50
commit
ee18a82424
12 files changed
+17
-86
No files matched your search
@@ -139,7 +139,6 @@ typedef enum {
|
||||
|
||||
KipConfigValue_eristaGpuUV,
|
||||
KipConfigValue_eristaGpuVmin,
|
||||
KipConfigValue_eristaGpuVmax,
|
||||
|
||||
KipConfigValue_marikoGpuUV,
|
||||
KipConfigValue_marikoGpuVmin,
|
||||
@@ -457,8 +456,6 @@ static inline const char* hocclkFormatConfigValue(HocClkConfigValue val, bool pr
|
||||
return pretty ? "Erista GPU Undervolt" : "erista_gpu_uv";
|
||||
case KipConfigValue_eristaGpuVmin:
|
||||
return pretty ? "Erista GPU Vmin" : "erista_gpu_vmin";
|
||||
case KipConfigValue_eristaGpuVmax:
|
||||
return pretty ? "Erista GPU Vmax" : "erista_gpu_vmax";
|
||||
|
||||
// GPU – Mariko
|
||||
case KipConfigValue_marikoGpuUV:
|
||||
@@ -710,7 +707,6 @@ static inline uint64_t hocclkValidConfigValue(HocClkConfigValue val, uint64_t in
|
||||
case KipConfigValue_marikoCpuMaxClock:
|
||||
case KipConfigValue_eristaGpuUV:
|
||||
case KipConfigValue_eristaGpuVmin:
|
||||
case KipConfigValue_eristaGpuVmax:
|
||||
case KipConfigValue_marikoGpuUV:
|
||||
case KipConfigValue_marikoGpuVmin:
|
||||
case KipConfigValue_marikoGpuVmax:
|
||||
|
||||
@@ -538,12 +538,6 @@ std::vector<std::string> ConfigInfoStrings(HocClkConfigValue val, bool isMariko,
|
||||
"Default: 810 mV (812mV as erista is stepped by 6.5mV instead of 5mV)"
|
||||
};
|
||||
|
||||
case KipConfigValue_eristaGpuVmax:
|
||||
return {
|
||||
"Maximum GPU voltage",
|
||||
"Default: 1050mV"
|
||||
};
|
||||
|
||||
case KipConfigValue_commonGpuVoltOffset:
|
||||
return {
|
||||
"The offset added/subtracted to all GPU voltages marked as \"auto\"",
|
||||
|
||||
@@ -2570,8 +2570,6 @@ class GpuSubmenuGui : public MiscGui {
|
||||
{}, gpuUvConfE, false, true);
|
||||
addConfigButton(KipConfigValue_eristaGpuVmin, "GPU Minimum Voltage", ValueRange(675, 875, 5, "mV", 1), "GPU Minimum Voltage",
|
||||
&thresholdsDisabled, {}, {}, false, true);
|
||||
// addConfigButton(KipConfigValue_eristaGpuVmax, "GPU Maximum Voltage", ValueRange(800, 1050, 5, "mV", 1), "GPU Maximum Voltage",
|
||||
// &thresholdsDisabled, {}, {}, false, true);
|
||||
} else {
|
||||
addConfigButton(KipConfigValue_marikoGpuUV, "GPU Undervolt Table", ValueRange(0, 1, 1, "", 1), "GPU Undervolt Table", &thresholdsDisabled,
|
||||
{}, gpuUvConfM, false, true);
|
||||
@@ -2592,8 +2590,10 @@ class GpuSubmenuGui : public MiscGui {
|
||||
addConfigButton(KipConfigValue_marikoGpuVmin, "GPU VMIN", ValueRange(0, 0, 0, "0", 1), "GPU VMIN", &thresholdsDisabled, {}, mGpuVoltsVmin,
|
||||
false, true);
|
||||
ValueThresholds MgpuVmaxThresholds(805, 850);
|
||||
addConfigButton(KipConfigValue_marikoGpuVmax, "GPU Maximum Voltage", ValueRange(800, 995, 5, "mV", 1), "GPU Maximum Voltage",
|
||||
&MgpuVmaxThresholds, {}, {}, false, true);
|
||||
if(IsMariko()) {
|
||||
addConfigButton(KipConfigValue_marikoGpuVmax, "GPU Maximum Voltage", ValueRange(800, 995, 5, "mV", 1), "GPU Maximum Voltage",
|
||||
&MgpuVmaxThresholds, {}, {}, false, true);
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<NamedValue> gpuOffset = {
|
||||
|
||||
@@ -124,7 +124,6 @@ namespace file::kip {
|
||||
|
||||
CUST_WRITE_FIELD_BATCH(&table, eristaGpuUV, file::config::GetConfigValue(KipConfigValue_eristaGpuUV));
|
||||
CUST_WRITE_FIELD_BATCH(&table, eristaGpuVmin, file::config::GetConfigValue(KipConfigValue_eristaGpuVmin));
|
||||
CUST_WRITE_FIELD_BATCH(&table, eristaGpuVmax, file::config::GetConfigValue(KipConfigValue_eristaGpuVmax));
|
||||
|
||||
CUST_WRITE_FIELD_BATCH(&table, marikoGpuUV, file::config::GetConfigValue(KipConfigValue_marikoGpuUV));
|
||||
CUST_WRITE_FIELD_BATCH(&table, marikoGpuVmin, file::config::GetConfigValue(KipConfigValue_marikoGpuVmin));
|
||||
@@ -323,8 +322,6 @@ namespace file::kip {
|
||||
|
||||
configValues.values[KipConfigValue_eristaGpuUV] = cust_get_erista_gpu_uv(&table);
|
||||
configValues.values[KipConfigValue_eristaGpuVmin] = cust_get_erista_gpu_vmin(&table);
|
||||
configValues.values[KipConfigValue_eristaGpuVmax] = cust_get_erista_gpu_vmax(&table);
|
||||
|
||||
configValues.values[KipConfigValue_marikoGpuUV] = cust_get_mariko_gpu_uv(&table);
|
||||
configValues.values[KipConfigValue_marikoGpuVmin] = cust_get_mariko_gpu_vmin(&table);
|
||||
configValues.values[KipConfigValue_marikoGpuVmax] = cust_get_mariko_gpu_vmax(&table);
|
||||
|
||||
@@ -86,7 +86,6 @@ namespace file::kip {
|
||||
|
||||
u32 eristaGpuUV;
|
||||
u32 eristaGpuVmin;
|
||||
u32 eristaGpuVmax;
|
||||
|
||||
u32 marikoGpuUV;
|
||||
u32 marikoGpuVmin;
|
||||
@@ -365,9 +364,6 @@ namespace file::kip {
|
||||
static inline bool cust_set_erista_gpu_vmin(const char *p, u32 v) {
|
||||
CUST_WRITE_FIELD(p, eristaGpuVmin, v);
|
||||
}
|
||||
static inline bool cust_set_erista_gpu_vmax(const char *p, u32 v) {
|
||||
CUST_WRITE_FIELD(p, eristaGpuVmax, v);
|
||||
}
|
||||
static inline bool cust_set_mariko_gpu_uv(const char *p, u32 v) {
|
||||
CUST_WRITE_FIELD(p, marikoGpuUV, v);
|
||||
}
|
||||
@@ -585,9 +581,6 @@ namespace file::kip {
|
||||
static inline u32 cust_get_erista_gpu_vmin(const CustomizeTable *t) {
|
||||
return CUST_GET_FIELD(t, eristaGpuVmin);
|
||||
}
|
||||
static inline u32 cust_get_erista_gpu_vmax(const CustomizeTable *t) {
|
||||
return CUST_GET_FIELD(t, eristaGpuVmax);
|
||||
}
|
||||
static inline u32 cust_get_mariko_gpu_uv(const CustomizeTable *t) {
|
||||
return CUST_GET_FIELD(t, marikoGpuUV);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user