From bd52fdc4a41be4e3f749ff76ade0338ad71eba4b Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Tue, 16 Dec 2025 18:15:23 -0500 Subject: [PATCH] Revert "sysclk: improve dvfs" This reverts commit 25f264fca0cc971540df6bf507d1d4939ad23676. --- .../sys-clk/overlay/src/ui/gui/misc_gui.cpp | 2 +- .../sys-clk/sysmodule/src/clock_manager.cpp | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) 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 dcc535be..98520482 100644 --- a/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp +++ b/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp @@ -348,7 +348,7 @@ void MiscGui::listUI() ); this->listElement->addItem(new tsl::elm::CategoryHeader("KIP Editing")); - // addConfigToggle(HocClkConfigValue_KipEditing, nullptr); + addConfigToggle(HocClkConfigValue_KipEditing, nullptr); std::vector kipNameLabels = { NamedValue("hoc.kip", 0), diff --git a/Source/sys-clk/sysmodule/src/clock_manager.cpp b/Source/sys-clk/sysmodule/src/clock_manager.cpp index 00b5c7bd..7636c71e 100644 --- a/Source/sys-clk/sysmodule/src/clock_manager.cpp +++ b/Source/sys-clk/sysmodule/src/clock_manager.cpp @@ -252,12 +252,10 @@ u32 findIndexMHz(u32 arr[], u32 size, u32 value) { void ClockManager::Tick() { std::scoped_lock lock{this->contextMutex}; - if(Board::GetSocType() == SysClkSocType_Mariko && this->config->GetConfigValue(HocClkConfigValue_KipEditing)) { - if((Board::GetHz(SysClkModule_MEM) / 1000000) > 1600) - I2c_BuckConverter_SetMvOut(&I2c_Mariko_GPU, this->config->GetConfigValue(HocClkConfigValue_HighRamFreqVmin)); - else - I2c_BuckConverter_SetMvOut(&I2c_Mariko_GPU, this->config->GetConfigValue(KipConfigValue_marikoGpuVmin)); - } + if((Board::GetHz(SysClkModule_MEM) / 1000000) > 1600) + I2c_BuckConverter_SetMvOut(Board::GetSocType == SysClkSocType_Mariko ? &I2c_Mariko_GPU : &I2c_Erista_GPU, this->config->GetConfigValue(HocClkConfigValue_HighRamFreqVmin)); + else + I2c_BuckConverter_SetMvOut(Board::GetSocType == SysClkSocType_Mariko ? &I2c_Mariko_GPU : &I2c_Erista_GPU, this->config->GetConfigValue(KipConfigValue_marikoGpuVmin)); std::uint32_t mode = 0; AppletOperationMode opMode = appletGetOperationMode(); Result rc = apmExtGetCurrentPerformanceConfiguration(&mode); @@ -374,14 +372,7 @@ void ClockManager::Tick() } } - if(Board::GetSocType() == SysClkSocType_Mariko && this->config->GetConfigValue(HocClkConfigValue_KipEditing)) { - if((Board::GetHz(SysClkModule_MEM) / 1000000) <= 1600) - I2c_BuckConverter_SetMvOut(&I2c_Mariko_GPU, this->config->GetConfigValue(KipConfigValue_marikoGpuVmin)); - else - I2c_BuckConverter_SetMvOut(&I2c_Mariko_GPU, this->config->GetConfigValue(HocClkConfigValue_HighRamFreqVmin)); - } - - + } void ClockManager::ResetToStockClocks() {