From 1c21187f73afcefa5a67db6c8646a38edbb8d5ca Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Sat, 31 Jan 2026 17:12:50 -0500 Subject: [PATCH] sysclk: remove unused stuff --- Source/sys-clk/common/include/sysclk/board.h | 7 ++ Source/sys-clk/common/include/sysclk/config.h | 37 --------- .../overlay/src/ui/gui/freq_choice_gui.cpp | 6 +- .../sys-clk/overlay/src/ui/gui/misc_gui.cpp | 76 ++++++++++--------- Source/sys-clk/sysmodule/src/board.cpp | 2 +- .../sys-clk/sysmodule/src/clock_manager.cpp | 35 ++++----- 6 files changed, 68 insertions(+), 95 deletions(-) diff --git a/Source/sys-clk/common/include/sysclk/board.h b/Source/sys-clk/common/include/sysclk/board.h index fabb0b40..beea679e 100644 --- a/Source/sys-clk/common/include/sysclk/board.h +++ b/Source/sys-clk/common/include/sysclk/board.h @@ -125,6 +125,13 @@ typedef enum { HorizonOCSpeedo_EnumMax, } HorizonOCSpeedo; +typedef enum { + GPUUVLevel_NoUV = 0, + GPUUVLevel_SLT, + GPUUVLevel_HiOPT, + GPUUVLevel_EnumMax, +} GPUUndervoltLevel; + #define SYSCLK_ENUM_VALID(n, v) ((v) < n##_EnumMax) static inline const char* sysclkFormatModule(SysClkModule module, bool pretty) diff --git a/Source/sys-clk/common/include/sysclk/config.h b/Source/sys-clk/common/include/sysclk/config.h index 153939c0..79b41765 100644 --- a/Source/sys-clk/common/include/sysclk/config.h +++ b/Source/sys-clk/common/include/sysclk/config.h @@ -41,11 +41,7 @@ typedef enum { HocClkConfigValue_OverwriteBoostMode, HocClkConfigValue_EristaMaxCpuClock, - HocClkConfigValue_EristaMaxGpuClock, - HocClkConfigValue_EristaMaxMemClock, HocClkConfigValue_MarikoMaxCpuClock, - HocClkConfigValue_MarikoMaxGpuClock, - HocClkConfigValue_MarikoMaxMemClock, HocClkConfigValue_ThermalThrottle, HocClkConfigValue_ThermalThrottleThreshold, @@ -56,9 +52,6 @@ typedef enum { HocClkConfigValue_LiteTDPLimit, HocClkConfigValue_EnforceBoardLimit, - - HocClkConfigValue_KipEditing, - HocClkConfigValue_KipFileName, HorizonOCConfigValue_BatteryChargeCurrent, @@ -194,17 +187,9 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr case HocClkConfigValue_EristaMaxCpuClock: return pretty ? "CPU Max Display Clock" : "cpu_max_e"; - case HocClkConfigValue_EristaMaxGpuClock: - return pretty ? "Max GPU Clock" : "gpu_max_e"; - case HocClkConfigValue_EristaMaxMemClock: - return pretty ? "Erista Max MEM Clock" : "mem_max_e"; case HocClkConfigValue_MarikoMaxCpuClock: return pretty ? "CPU Max Display Clock" : "cpu_max_m"; - case HocClkConfigValue_MarikoMaxGpuClock: - return pretty ? "Mariko Max GPU Clock" : "gpu_max_m"; - case HocClkConfigValue_MarikoMaxMemClock: - return pretty ? "Mariko Max MEM Clock" : "mem_max_m"; case HocClkConfigValue_ThermalThrottle: return pretty ? "Thermal Throttle" : "thermal_throttle"; @@ -224,12 +209,6 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr case HocClkConfigValue_EnforceBoardLimit: return pretty ? "Enforce Board Limit" : "enforce_board_limit"; - case HocClkConfigValue_KipEditing: - return pretty ? "Enable KIP Editing" : "kip_editing"; - - case HocClkConfigValue_KipFileName: - return pretty ? "KIP File Name" : "kip_file_name"; - case HorizonOCConfigValue_BatteryChargeCurrent: return pretty ? "Battery Charge Current" : "bat_charge_current"; @@ -407,29 +386,19 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val) case SysClkConfigValue_CsvWriteIntervalMs: case HocClkConfigValue_UncappedClocks: case HocClkConfigValue_OverwriteBoostMode: - case HocClkConfigValue_KipFileName: case HorizonOCConfigValue_BatteryChargeCurrent: case HorizonOCConfigValue_OverwriteRefreshRate: case HorizonOCConfigValue_EnableUnsafeDisplayFreqs: return 0ULL; case HocClkConfigValue_EristaMaxCpuClock: return 1785ULL; - case HocClkConfigValue_EristaMaxGpuClock: - return 921ULL; - case HocClkConfigValue_EristaMaxMemClock: - return 1600ULL; case HocClkConfigValue_MarikoMaxCpuClock: return 1963ULL; - case HocClkConfigValue_MarikoMaxGpuClock: - return 1075ULL; - case HocClkConfigValue_MarikoMaxMemClock: - return 1862ULL; case HocClkConfigValue_ThermalThrottle: case HocClkConfigValue_HandheldTDP: case HocClkConfigValue_EnforceBoardLimit: - case HocClkConfigValue_KipEditing: case HocClkConfigValue_FixCpuVoltBug: return 1ULL; case HocClkConfigValue_ThermalThrottleThreshold: @@ -448,11 +417,7 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in switch(val) { case HocClkConfigValue_EristaMaxCpuClock: - case HocClkConfigValue_EristaMaxGpuClock: - case HocClkConfigValue_EristaMaxMemClock: case HocClkConfigValue_MarikoMaxCpuClock: - case HocClkConfigValue_MarikoMaxGpuClock: - case HocClkConfigValue_MarikoMaxMemClock: case HocClkConfigValue_ThermalThrottleThreshold: case HocClkConfigValue_HandheldTDPLimit: case HocClkConfigValue_LiteTDPLimit: @@ -468,8 +433,6 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in case HocClkConfigValue_ThermalThrottle: case HocClkConfigValue_HandheldTDP: case HocClkConfigValue_EnforceBoardLimit: - case HocClkConfigValue_KipEditing: - case HocClkConfigValue_KipFileName: case HorizonOCConfigValue_OverwriteRefreshRate: case HocClkConfigValue_FixCpuVoltBug: case HorizonOCConfigValue_EnableUnsafeDisplayFreqs: diff --git a/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp b/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp index 3fb04c08..c72d955e 100644 --- a/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp +++ b/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp @@ -137,9 +137,9 @@ void FreqChoiceGui::listUI() this->configList->values[HocClkConfigValue_EristaMaxCpuClock] < mhz) continue; - if (moduleName == "gpu" && - this->configList->values[HocClkConfigValue_EristaMaxGpuClock] < mhz) - continue; + // if (moduleName == "gpu" && + // this->configList->values[HocClkConfigValue_EristaMaxGpuClock] < mhz) + // continue; // if (moduleName == "mem" && // this->configList->values[HocClkConfigValue_EristaMaxMemClock] < mhz) diff --git a/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp b/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp index 3745757d..34998eb2 100644 --- a/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp +++ b/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp @@ -460,7 +460,7 @@ protected: addConfigToggle(KipConfigValue_hpMode, "HP Mode"); std::vector marikoMaxEmcClock = { - NamedValue("1600MHz", 1600000), + NamedValue("1600MHz (JEDEC.)", 1600000), NamedValue("1633MHz", 1633000), NamedValue("1666MHz", 1666000), NamedValue("1700MHz", 1700000), @@ -468,17 +468,16 @@ protected: NamedValue("1766MHz", 1766000), NamedValue("1800MHz", 1800000), NamedValue("1833MHz", 1833000), - NamedValue("1862MHz", 1862400), - NamedValue("1866MHz", 1866000), + NamedValue("1866MHz (JEDEC.)", 1866000), NamedValue("1900MHz", 1900000), NamedValue("1933MHz", 1933000), NamedValue("1966MHz", 1966000), - NamedValue("1996MHz", 1996800), + NamedValue("1996MHz (JEDEC.)", 1996800), NamedValue("2000MHz", 2000000), NamedValue("2033MHz", 2033000), NamedValue("2066MHz", 2066000), NamedValue("2100MHz", 2100000), - NamedValue("2133MHz", 2133000), + NamedValue("2133MHz (JEDEC.)", 2133000), NamedValue("2166MHz", 2166000), NamedValue("2200MHz", 2200000), NamedValue("2233MHz", 2233000), @@ -486,7 +485,7 @@ protected: NamedValue("2300MHz", 2300000), NamedValue("2333MHz", 2333000), NamedValue("2366MHz", 2366000), - NamedValue("2400MHz", 2400000), + NamedValue("2400MHz (JEDEC.)", 2400000), NamedValue("2433MHz", 2433000), NamedValue("2466MHz", 2466000), NamedValue("2500MHz", 2500000), @@ -502,7 +501,7 @@ protected: NamedValue("2833MHz", 2833000), NamedValue("2866MHz", 2866000), NamedValue("2900MHz", 2900000), - NamedValue("2933MHz", 2933000), + NamedValue("2933MHz (JEDEC.)", 2933000), NamedValue("2966MHz", 2966000), NamedValue("3000MHz", 3000000), NamedValue("3033MHz", 3033000), @@ -510,20 +509,20 @@ protected: NamedValue("3100MHz", 3100000), NamedValue("3133MHz", 3133000), NamedValue("3166MHz", 3166000), - NamedValue("3200MHz", 3200000), - NamedValue("3233MHz (Needs high Speedo/PLL)", 3233000), - NamedValue("3266MHz (Needs high Speedo/PLL)", 3266000), - NamedValue("3300MHz (Needs high Speedo/PLL)", 3300000), - NamedValue("3333MHz (Needs extreme Speedo/PLL)", 3333000), - NamedValue("3366MHz (Needs extreme Speedo/PLL)", 3366000), - NamedValue("3400MHz (Needs extreme Speedo/PLL)", 3400000), - NamedValue("3433MHz (Needs ridiculous Speedo/PLL)", 3433000), - NamedValue("3466MHz (Needs ridiculous Speedo/PLL)", 3466000), - NamedValue("3500MHz (Needs ridiculous Speedo/PLL)", 3500000), + NamedValue("3200MHz (JEDEC.)", 3200000), + // NamedValue("3233MHz (Needs high Speedo/PLL)", 3233000), + // NamedValue("3266MHz (Needs high Speedo/PLL)", 3266000), + // NamedValue("3300MHz (Needs high Speedo/PLL)", 3300000), + // NamedValue("3333MHz (Needs extreme Speedo/PLL)", 3333000), + // NamedValue("3366MHz (Needs extreme Speedo/PLL)", 3366000), + // NamedValue("3400MHz (Needs extreme Speedo/PLL)", 3400000), + // NamedValue("3433MHz (Needs ridiculous Speedo/PLL)", 3433000), + // NamedValue("3466MHz (Needs ridiculous Speedo/PLL)", 3466000), + // NamedValue("3500MHz (Needs ridiculous Speedo/PLL)", 3500000), }; std::vector eristaMaxEmcClock = { - NamedValue("1600MHz", 1600000), + NamedValue("1600MHz (JEDEC.)", 1600000), NamedValue("1633MHz", 1633000), NamedValue("1666MHz", 1666000), NamedValue("1700MHz", 1700000), @@ -531,7 +530,7 @@ protected: NamedValue("1766MHz", 1766000), NamedValue("1800MHz", 1800000), NamedValue("1833MHz", 1833000), - NamedValue("1866MHz", 1866000), + NamedValue("1866MHz (JEDEC.)", 1866000), NamedValue("1900MHz", 1900000), NamedValue("1933MHz", 1933000), NamedValue("1966MHz", 1966000), @@ -539,7 +538,7 @@ protected: NamedValue("2033MHz", 2033000), NamedValue("2066MHz", 2066000), NamedValue("2100MHz", 2100000), - NamedValue("2133MHz", 2133000), + NamedValue("2133MHz (JEDEC.)", 2133000), NamedValue("2166MHz", 2166000), NamedValue("2200MHz (high power draw!)", 2200000), NamedValue("2233MHz (high power draw!)", 2233000), @@ -547,7 +546,7 @@ protected: NamedValue("2300MHz (high power draw!)", 2300000), NamedValue("2333MHz (high power draw!)", 2333000), NamedValue("2366MHz (high power draw!)", 2366000), - NamedValue("2400MHz (high power draw!)", 2400000), + NamedValue("2400MHz (high power draw & JEDEC.)", 2400000), }; if(IsErista()) { @@ -1209,16 +1208,20 @@ protected: addConfigButton(KipConfigValue_g_volt_921600, "921.6MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); addConfigButton(KipConfigValue_g_volt_998400, "998.4MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); addConfigButton(KipConfigValue_g_volt_1075200, "1075.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); - addConfigButton(KipConfigValue_g_volt_1152000, "1152.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); - addConfigButton(KipConfigValue_g_volt_1228800, "1228.8MHz (SLT/HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); - addConfigButton(KipConfigValue_g_volt_1267200, "1267.2MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); - addConfigButton(KipConfigValue_g_volt_1305600, "1305.6MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); - addConfigButton(KipConfigValue_g_volt_1344000, "1344.0MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); - addConfigButton(KipConfigValue_g_volt_1382400, "1382.4MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); - addConfigButton(KipConfigValue_g_volt_1420800, "1420.8MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); - addConfigButton(KipConfigValue_g_volt_1459200, "1459.2MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); - addConfigButton(KipConfigValue_g_volt_1497600, "1497.6MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); - addConfigButton(KipConfigValue_g_volt_1536000, "1536.0MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); + if(this->configList->values[KipConfigValue_marikoGpuUV] >= GPUUVLevel_SLT) + addConfigButton(KipConfigValue_g_volt_1152000, "1152.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); + if(this->configList->values[KipConfigValue_marikoGpuUV] >= GPUUVLevel_HiOPT) { + addConfigButton(KipConfigValue_g_volt_1228800, "1228.8MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); + addConfigButton(KipConfigValue_g_volt_1267200, "1267.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); + addConfigButton(KipConfigValue_g_volt_1305600, "1305.6MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false); + addConfigButton(KipConfigValue_g_volt_1344000, "1344.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); + addConfigButton(KipConfigValue_g_volt_1382400, "1382.4MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); + addConfigButton(KipConfigValue_g_volt_1420800, "1420.8MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); + addConfigButton(KipConfigValue_g_volt_1459200, "1459.2MHz)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); + addConfigButton(KipConfigValue_g_volt_1497600, "1497.6MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); + addConfigButton(KipConfigValue_g_volt_1536000, "1536.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false); + } + } else { tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) { @@ -1254,10 +1257,13 @@ protected: addConfigButton(KipConfigValue_g_volt_e_844800, "844.8MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false); addConfigButton(KipConfigValue_g_volt_e_883200, "883.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false); addConfigButton(KipConfigValue_g_volt_e_921600, "921.6MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false); - addConfigButton(KipConfigValue_g_volt_e_960000, "960.0MHz (SLT/HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false); - addConfigButton(KipConfigValue_g_volt_e_998400, "998.4MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false); - addConfigButton(KipConfigValue_g_volt_e_1036800, "1036.8MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts_noAuto, false); - addConfigButton(KipConfigValue_g_volt_e_1075200, "1075.2MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts_noAuto, false); + if(this->configList->values[KipConfigValue_eristaGpuUV] >= GPUUVLevel_SLT) + addConfigButton(KipConfigValue_g_volt_e_960000, "960.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false); + if(this->configList->values[KipConfigValue_eristaGpuUV] >= GPUUVLevel_HiOPT) { + addConfigButton(KipConfigValue_g_volt_e_998400, "998.4MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false); + addConfigButton(KipConfigValue_g_volt_e_1036800, "1036.8MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts_noAuto, false); + addConfigButton(KipConfigValue_g_volt_e_1075200, "1075.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts_noAuto, false); + } } } }; diff --git a/Source/sys-clk/sysmodule/src/board.cpp b/Source/sys-clk/sysmodule/src/board.cpp index c2ca3056..2335c4de 100644 --- a/Source/sys-clk/sysmodule/src/board.cpp +++ b/Source/sys-clk/sysmodule/src/board.cpp @@ -766,7 +766,7 @@ std::uint32_t Board::GetPartLoad(SysClkPartLoad loadSource) return idletick0; case HocClkPartLoad_BAT: batteryInfoGetChargeInfo(&info); - return info.BatteryAge; + return info.RawBatteryCharge; case HocClkPartLoad_FAN: return fanLevel; default: diff --git a/Source/sys-clk/sysmodule/src/clock_manager.cpp b/Source/sys-clk/sysmodule/src/clock_manager.cpp index 93631cb7..ea9d7216 100644 --- a/Source/sys-clk/sysmodule/src/clock_manager.cpp +++ b/Source/sys-clk/sysmodule/src/clock_manager.cpp @@ -46,7 +46,6 @@ bool hasChanged = true; ClockManager *ClockManager::instance = NULL; Thread governorTHREAD; u32 initialConfigValues[SysClkConfigValue_EnumMax]; // initial config. used for safety checks -bool writeBootConfigValues = true; // do we write the initial config values? bool kipAvailable = false; ClockManager *ClockManager::GetInstance() @@ -823,6 +822,8 @@ void ClockManager::GetKipData() { writeNotification("Horizon OC\nKip read failed"); return; } + + static bool writeBootConfigValues = true; if(writeBootConfigValues) { writeBootConfigValues = false; @@ -870,14 +871,6 @@ void ClockManager::GetKipData() { initialConfigValues[KipConfigValue_marikoGpuVmax] = cust_get_mariko_gpu_vmax(&table); initialConfigValues[KipConfigValue_commonGpuVoltOffset] = cust_get_common_gpu_offset(&table); initialConfigValues[KipConfigValue_gpuSpeedo] = cust_get_gpu_speedo(&table); - - for (int i = 0; i < 24; i++) { - initialConfigValues[KipConfigValue_g_volt_76800 + i] = cust_get_mariko_gpu_volt(&table, i); - } - - for (int i = 0; i < 27; i++) { - initialConfigValues[KipConfigValue_g_volt_e_76800 + i] = cust_get_erista_gpu_volt(&table, i); - } } configValues.values[KipConfigValue_mtcConf] = cust_get_mtc_conf(&table); @@ -926,10 +919,12 @@ void ClockManager::GetKipData() { for (int i = 0; i < 24; i++) { configValues.values[KipConfigValue_g_volt_76800 + i] = cust_get_mariko_gpu_volt(&table, i); + initialConfigValues[KipConfigValue_g_volt_76800 + i] = cust_get_mariko_gpu_volt(&table, i); } for (int i = 0; i < 27; i++) { configValues.values[KipConfigValue_g_volt_e_76800 + i] = cust_get_erista_gpu_volt(&table, i); + initialConfigValues[KipConfigValue_g_volt_e_76800 + i] = cust_get_erista_gpu_volt(&table, i); } // if(cust_get_cust_rev(&table) == KIP_CUST_REV) @@ -979,18 +974,20 @@ void ClockManager::UpdateRamTimings() { // writeNotification("Horizon OC\nCritical values changed!\nUnable to write timings"); // return; // } - u32 t1_tRCD = initialConfigValues[KipConfigValue_t1_tRCD]; - u32 t2_tRP = initialConfigValues[KipConfigValue_t2_tRP]; - u32 t3_tRAS = initialConfigValues[KipConfigValue_t3_tRAS]; - u32 t4_tRRD = initialConfigValues[KipConfigValue_t4_tRRD]; - u32 t5_tRFC = initialConfigValues[KipConfigValue_t5_tRFC]; - u32 t6_tRTW = initialConfigValues[KipConfigValue_t6_tRTW]; - u32 t7_tWTR = initialConfigValues[KipConfigValue_t7_tWTR]; - u32 t8_tREFI = initialConfigValues[KipConfigValue_t8_tREFI]; + u32 t1_tRCD = this->config->GetConfigValue(KipConfigValue_t1_tRCD); + u32 t2_tRP = this->config->GetConfigValue(KipConfigValue_t2_tRP); + u32 t3_tRAS = this->config->GetConfigValue(KipConfigValue_t3_tRAS); + u32 t4_tRRD = this->config->GetConfigValue(KipConfigValue_t4_tRRD); + u32 t5_tRFC = this->config->GetConfigValue(KipConfigValue_t5_tRFC); + u32 t6_tRTW = this->config->GetConfigValue(KipConfigValue_t6_tRTW); + u32 t7_tWTR = this->config->GetConfigValue(KipConfigValue_t7_tWTR); + u32 t8_tREFI = this->config->GetConfigValue(KipConfigValue_t8_tREFI); + bool hpMode = (bool)this->config->GetConfigValue(KipConfigValue_hpMode); + u64 ramFreq = initialConfigValues[KipConfigValue_marikoEmcMaxClock]; u32 rlAdd = initialConfigValues[KipConfigValue_mem_burst_read_latency]; u32 wlAdd = initialConfigValues[KipConfigValue_mem_burst_write_latency]; - bool hpMode = (bool)initialConfigValues[KipConfigValue_hpMode]; + Board::UpdateShadowRegs(t1_tRCD, t2_tRP, t3_tRAS, t4_tRRD, t5_tRFC, t6_tRTW, t7_tWTR, t8_tREFI, ramFreq, rlAdd, wlAdd, hpMode); } @@ -1021,7 +1018,7 @@ unsigned int ClockManager::GetGpuVoltage (unsigned int freq, int speedo) int bracket = GetSpeedoBracket(speedo); if (freq < 1601) - return 0; + return 610; loop = 0; do