diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp index 0bf60016..6d0d3a34 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp @@ -142,9 +142,9 @@ volatile CustomizeTable C = { AUTO /* 921 */, AUTO /* 998 */, AUTO /* 1075 */, - AUTO /* 1152 */, - AUTO /* 1228 */, - AUTO /* 1267 (Disabled by default) */, + DEACTIVATED_GPU_FREQ /* 1152 */, + DEACTIVATED_GPU_FREQ /* 1228 */, + DEACTIVATED_GPU_FREQ /* 1267 (Disabled by default) */, DEACTIVATED_GPU_FREQ /* 1305 (Disabled by default) */, DEACTIVATED_GPU_FREQ /* 1344 (Disabled by default) */, DEACTIVATED_GPU_FREQ /* 1382 (Disabled by default) */, diff --git a/Source/sys-clk/sysmodule/src/board.cpp b/Source/sys-clk/sysmodule/src/board.cpp index d0f8988a..607b78d7 100644 --- a/Source/sys-clk/sysmodule/src/board.cpp +++ b/Source/sys-clk/sysmodule/src/board.cpp @@ -426,14 +426,14 @@ void Board::SetHz(SysClkModule module, std::uint32_t hz) DisplayRefresh_SetRate(hz); return; } - + if(module > SysClkModule_MEM) + return; if(HOSSVC_HAS_CLKRST) { ClkrstSession session = {0}; rc = clkrstOpenSession(&session, Board::GetPcvModuleId(module), 3); ASSERT_RESULT_OK(rc, "clkrstOpenSession"); - rc = clkrstSetClockRate(&session, hz); ASSERT_RESULT_OK(rc, "clkrstSetClockRate"); diff --git a/Source/sys-clk/sysmodule/src/clock_manager.cpp b/Source/sys-clk/sysmodule/src/clock_manager.cpp index aac60e0d..7d98b014 100644 --- a/Source/sys-clk/sysmodule/src/clock_manager.cpp +++ b/Source/sys-clk/sysmodule/src/clock_manager.cpp @@ -694,7 +694,7 @@ bool ClockManager::RefreshContext() targetHz = this->config->GetAutoClockHz(GLOBAL_PROFILE_ID, HorizonOCModule_Display, this->context->profile, true); } - if(targetHz && this->context->realFreqs[HorizonOCModule_Display] != targetHz) + if(targetHz && this->context->realFreqs[HorizonOCModule_Display] > targetHz) this->context->realFreqs[HorizonOCModule_Display] = targetHz; // clean up display real freqs, should probably be moved to the real freqs loop? diff --git a/Source/sys-clk/sysmodule/src/errors.cpp b/Source/sys-clk/sysmodule/src/errors.cpp index f94b381d..5fc89a35 100644 --- a/Source/sys-clk/sysmodule/src/errors.cpp +++ b/Source/sys-clk/sysmodule/src/errors.cpp @@ -28,14 +28,14 @@ #include "errors.h" #include #include - +#include "file_utils.h" void Errors::ThrowException(const char* format, ...) { va_list args; va_start(args, format); const char* msg = Errors::FormatMessage(format, args); va_end(args); - + FileUtils::LogLine(format, args); throw std::runtime_error(msg); } diff --git a/dist/README.md b/dist/README.md index 62b85423..87c8cad7 100644 --- a/dist/README.md +++ b/dist/README.md @@ -35,13 +35,14 @@ It enables advanced CPU, GPU, and RAM tuning with user-friendly configuration to ## Features * **CPU:** Up to 1963MHz (Mariko) / 1785MHz (Erista) -* **GPU:** Up to 1075MHz (Mariko) / 998MHz (Erista) +* **GPU:** Up to 1075MHz (Mariko) / 921MHz (Erista) * **RAM:** Up to 1866MHz (Mariko) / 1600MHz (Erista) * Over/undervolting support * Built-in configurator * Compatible with most homebrew > *Higher (potentially dangerous) frequencies are unlockable via configuration.* +> *Erista and Mariko units can usually push a bit further fully safely with a bit of undervolting, however this may not work on all units.* > *The exact maximum overclock possible varies per console, although most consoles should be able to do this safely.* --- diff --git a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp index 01214a92..574da04a 100644 Binary files a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp and b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp differ