diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp index 003f80ba..1391fe69 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp @@ -120,9 +120,8 @@ volatile CustomizeTable C = { .eristaGpuVmin = 810, .marikoGpuUV = 2, -/* Vmin past 795mV won't work due boot voltage being 800mV (can be adjusted though). */ +/* Vmin past 795mV won't work due boot voltage being 800mV. */ .marikoGpuVmin = 610, -.marikoGpuBootVolt = 800, /* Used during boot and when temp is <20°C */ .marikoGpuVmax = 800, .commonGpuVoltOffset = 0, diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp index 1db4f8aa..bd15f2c5 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp @@ -122,7 +122,6 @@ struct CustomizeTable { u32 marikoGpuUV; u32 marikoGpuVmin; - u32 marikoGpuBootVolt; u32 marikoGpuVmax; s32 commonGpuVoltOffset; diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp index e6ba8ffd..92e2b50f 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp @@ -52,9 +52,9 @@ namespace ams::ldr::hoc::pcv::mariko { R_THROW(ldr::ResultInvalidGpuDvfs()); } - if (C.marikoGpuBootVolt) { - PATCH_OFFSET(ptr - 3, C.marikoGpuBootVolt); - } + // if (C.marikoGpuBootVolt) { + // PATCH_OFFSET(ptr - 3, C.marikoGpuBootVolt); + // } if (C.marikoGpuVmin) { PATCH_OFFSET(ptr, C.marikoGpuVmin); diff --git a/Source/hoc-clk/common/include/hocclk/config.h b/Source/hoc-clk/common/include/hocclk/config.h index 8c33c2e7..fbcebb51 100644 --- a/Source/hoc-clk/common/include/hocclk/config.h +++ b/Source/hoc-clk/common/include/hocclk/config.h @@ -140,7 +140,6 @@ typedef enum { KipConfigValue_marikoGpuUV, KipConfigValue_marikoGpuVmin, - KipConfigValue_marikoGpuBootVolt, KipConfigValue_marikoGpuVmax, KipConfigValue_commonGpuVoltOffset, @@ -450,8 +449,6 @@ static inline const char* hocclkFormatConfigValue(HocClkConfigValue val, bool pr return pretty ? "Mariko GPU Undervolt" : "mariko_gpu_uv"; case KipConfigValue_marikoGpuVmin: return pretty ? "Mariko GPU Vmin" : "mariko_gpu_vmin"; - case KipConfigValue_marikoGpuBootVolt: - return pretty ? "Mariko GPU Boot Voltage" : "mariko_gpu_boot_volt"; case KipConfigValue_marikoGpuVmax: return pretty ? "Mariko GPU Vmax" : "mariko_gpu_vmax"; @@ -683,7 +680,6 @@ static inline uint64_t hocclkValidConfigValue(HocClkConfigValue val, uint64_t in case KipConfigValue_eristaGpuVmin: case KipConfigValue_marikoGpuUV: case KipConfigValue_marikoGpuVmin: - case KipConfigValue_marikoGpuBootVolt: case KipConfigValue_marikoGpuVmax: case KipConfigValue_commonGpuVoltOffset: case KipConfigValue_g_volt_76800: diff --git a/Source/hoc-clk/overlay/src/ui/gui/config_info_strings.cpp b/Source/hoc-clk/overlay/src/ui/gui/config_info_strings.cpp index 8892d3ca..fc000bc5 100644 --- a/Source/hoc-clk/overlay/src/ui/gui/config_info_strings.cpp +++ b/Source/hoc-clk/overlay/src/ui/gui/config_info_strings.cpp @@ -94,7 +94,7 @@ std::vector ConfigInfoStrings(HocClkConfigValue val, bool isMariko, case HocClkConfigValue_InputCurrentLimit: return { "Overrides the maximum input current from the charger.", - isHoag ? "Default: 900 mA" : "1200 mA" + isHoag ? "Default: 900 mA" : "1200 mA" }; case HocClkConfigValue_AulaDisplayColorPreset: @@ -494,7 +494,7 @@ std::vector ConfigInfoStrings(HocClkConfigValue val, bool isMariko, "Maximum GPU voltage", "Default: 800 mV" }; - + case HocClkConfigValue_DVFSMode: return { "The mode used for GPU DVFS", @@ -542,12 +542,6 @@ std::vector ConfigInfoStrings(HocClkConfigValue val, bool isMariko, "- Enabled: Enables GPU scheduling, 96.5% GPU max load", "Default: Do not override" }; - case KipConfigValue_marikoGpuBootVolt: - return { - "The voltage supplied to the GPU during boot and when the temperature is below 20°C (in mV).", - "Warning: Changing this value may cause instability.", - "Default: 800mV" - }; default: return {}; } diff --git a/Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp b/Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp index 3a7345df..ba4e6624 100644 --- a/Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp +++ b/Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp @@ -669,9 +669,6 @@ class ExperimentalSettingsSubMenuGui : public MiscGui { addConfigButton(HocClkConfigValue_GPUSchedulingMethod, "GPU Scheduling Override Method", ValueRange(0, 0, 1, "", 0), "GPU Scheduling Override Method", &thresholdsDisabled, {}, gpuSchedMethodValues, false); - addConfigButton(KipConfigValue_marikoGpuBootVolt, "GPU Boot Volt", ValueRange(700, 800, 5, "mV", 1), "GPU Boot Voltage", &thresholdsDisabled, - {}, {}, false, true); - std::vector ramRFMeasurementMethods = { NamedValue("PLL", MemoryFrequencyMeasurementMode_PLL), NamedValue("Actmon", MemoryFrequencyMeasurementMode_Actmon), diff --git a/Source/hoc-clk/sysmodule/src/file/kip.cpp b/Source/hoc-clk/sysmodule/src/file/kip.cpp index de0f9443..07ccbb04 100644 --- a/Source/hoc-clk/sysmodule/src/file/kip.cpp +++ b/Source/hoc-clk/sysmodule/src/file/kip.cpp @@ -128,7 +128,6 @@ namespace kip { CUST_WRITE_FIELD_BATCH(&table, marikoGpuUV, config::GetConfigValue(KipConfigValue_marikoGpuUV)); CUST_WRITE_FIELD_BATCH(&table, marikoGpuVmin, config::GetConfigValue(KipConfigValue_marikoGpuVmin)); - CUST_WRITE_FIELD_BATCH(&table, marikoGpuBootVolt, config::GetConfigValue(KipConfigValue_marikoGpuBootVolt)); CUST_WRITE_FIELD_BATCH(&table, marikoGpuVmax, config::GetConfigValue(KipConfigValue_marikoGpuVmax)); CUST_WRITE_FIELD_BATCH(&table, commonGpuVoltOffset, config::GetConfigValue(KipConfigValue_commonGpuVoltOffset)); @@ -294,7 +293,6 @@ namespace kip { configValues.values[KipConfigValue_eristaGpuVmin] = cust_get_erista_gpu_vmin(&table); configValues.values[KipConfigValue_marikoGpuUV] = cust_get_mariko_gpu_uv(&table); configValues.values[KipConfigValue_marikoGpuVmin] = cust_get_mariko_gpu_vmin(&table); - configValues.values[KipConfigValue_marikoGpuBootVolt] = cust_get_mariko_gpu_boot_volt(&table); configValues.values[KipConfigValue_marikoGpuVmax] = cust_get_mariko_gpu_vmax(&table); configValues.values[KipConfigValue_commonGpuVoltOffset] = cust_get_common_gpu_offset(&table); @@ -337,9 +335,6 @@ namespace kip { if (previousVersion < 240 && version >= 240) { // <2.4.0 -> 2.4.0 migration - // add marikoGpuBootVolt with default value of 800mV - configValues.values[KipConfigValue_marikoGpuBootVolt] = 800; - configValues.values[KipConfigValue_marikoGpuUV] += 2; // Raise UV levels configValues.values[KipConfigValue_commonGpuVoltOffset] = (u32)(-(s64)(configValues.values[KipConfigValue_commonGpuVoltOffset])); // Migrate GPU Volt Offset diff --git a/Source/hoc-clk/sysmodule/src/file/kip.hpp b/Source/hoc-clk/sysmodule/src/file/kip.hpp index 1816ff1e..a1ab2bf1 100644 --- a/Source/hoc-clk/sysmodule/src/file/kip.hpp +++ b/Source/hoc-clk/sysmodule/src/file/kip.hpp @@ -91,7 +91,6 @@ namespace kip { u32 marikoGpuUV; u32 marikoGpuVmin; - u32 marikoGpuBootVolt; u32 marikoGpuVmax; u32 commonGpuVoltOffset; @@ -374,9 +373,6 @@ namespace kip { static inline bool cust_set_mariko_gpu_vmin(const char *p, u32 v) { CUST_WRITE_FIELD(p, marikoGpuVmin, v); } - static inline bool cust_set_mariko_gpu_boot_volt(const char *p, u32 v) { - CUST_WRITE_FIELD(p, marikoGpuBootVolt, v); - } static inline bool cust_set_mariko_gpu_vmax(const char *p, u32 v) { CUST_WRITE_FIELD(p, marikoGpuVmax, v); } @@ -593,9 +589,6 @@ namespace kip { static inline u32 cust_get_mariko_gpu_vmin(const CustomizeTable *t) { return CUST_GET_FIELD(t, marikoGpuVmin); } - static inline u32 cust_get_mariko_gpu_boot_volt(const CustomizeTable *t) { - return CUST_GET_FIELD(t, marikoGpuBootVolt); - } static inline u32 cust_get_mariko_gpu_vmax(const CustomizeTable *t) { return CUST_GET_FIELD(t, marikoGpuVmax); }