diff --git a/.gitignore b/.gitignore index 564dbe89..11913753 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ *.DS_Store .vscode/ dist/ -.pyc \ No newline at end of file +.pyc +build/ +__pycache__/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 25cb2961..a931439a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ path = source/hoc-monitor/lib/Atmosphere-libs url = https://github.com/Atmosphere-NX/Atmosphere-libs.git [submodule "source/sys-clk/overlay/lib/libultrahand"] - path = source/sys-clk/overlay/libs/libultrahand + path = source/sys-clk/overlay/lib/libultrahand url = https://github.com/ppkantorski/libultrahand.git diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp index fda8f252..06f36687 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp @@ -22,7 +22,7 @@ #define ENABLED 1 #define DISABLED 0 - +#define CPU_MAX_MAX_VOLT 1375000 namespace ams::ldr::oc { //volatile EristaMtcTable EristaMtcTablePlaceholder = { .rev = ERISTA_MTC_MAGIC, }; @@ -56,7 +56,7 @@ volatile CustomizeTable C = { .EmcDvbShift = 0, -// Defaults - (3-3-2) 0-1-4-3-6 +// Defaults - Zeroed // Primary .t1_tRCD = 0, @@ -111,20 +111,33 @@ volatile CustomizeTable C = { .eristaGpuVoltArray = { 750 /* 76 */, + 750 /* 115 */, 750 /* 153 */, + 750 /* 192 */, 750 /* 230 */, - 750 /* 307 */, - 775 /* 384 */, - 800 /* 460 */, - 825 /* 537 */, - 850 /* 614 */, - 875 /* 691 */, - 900 /* 768 */, + 775 /* 269 */, + 775 /* 307 */, + 800 /* 346 */, + 800 /* 384 */, + 825 /* 422 */, + 825 /* 460 */, + 850 /* 499 */, + 850 /* 537 */, + 875 /* 576 */, + 875 /* 614 */, + 900 /* 652 */, + 900 /* 691 */, + 925 /* 729 */, + 925 /* 768 */, + 950 /* 806 */, 950 /* 844 */, + 975 /* 883 */, 975 /* 921 */, + 0 /* 960 (Disabled by default) */, 0 /* 998 (Disabled by default) */, + 0 /* 1036 (Disabled by default) */, 0 /* 1075 (Disabled by default) */, -}, +}; @@ -148,11 +161,11 @@ volatile CustomizeTable C = { { 1581000, { 1130000 }, { 2889664, -122173, 1834 } }, { 1683000, { 1168000 }, { 5100873, -279186, 4747 } }, { 1785000, { 1227500 }, { 5100873, -279186, 4747 } }, - { 1887000, { 1375000 }, { 5100873, -279186, 4747 } }, - { 1963500, { 1375000 }, { 5100873, -279186, 4747 } }, - { 2091000, { 1375000 }, { 5100873, -279186, 4747 } }, - { 2193000, { 1375000 }, { 5100873, -279186, 4747 } }, - { 2295000, { 1375000 }, { 5100873, -279186, 4747 } }, + { 1887000, { CPU_MAX_MAX_VOLT }, { 5100873, -279186, 4747 } }, + { 1963500, { CPU_MAX_MAX_VOLT }, { 5100873, -279186, 4747 } }, + { 2091000, { CPU_MAX_MAX_VOLT }, { 5100873, -279186, 4747 } }, + { 2193000, { CPU_MAX_MAX_VOLT }, { 5100873, -279186, 4747 } }, + { 2295000, { CPU_MAX_MAX_VOLT }, { 5100873, -279186, 4747 } }, }, /* - Mariko CPU DVFS Table: @@ -177,13 +190,17 @@ volatile CustomizeTable C = { { 1785000, { 1527196, -36015, 27 }, { 1120000 } }, { 1887000, { 1609246, -37515, 27 }, { 1120000 } }, { 1963500, { 1675751, -38635, 27 }, { 1120000 } }, + + { 2091000, { 1716501, -39395, 27 }, { CPU_MAX_MAX_VOLT } }, + { 2193000, { 1775132, -40505, 27 }, { CPU_MAX_MAX_VOLT } }, + { 2295000, { 1866287, -42005, 27 }, { CPU_MAX_MAX_VOLT } }, }, .marikoCpuDvfsTableSLT = { // { 204000, { 732856, -17335, 113 }, { } }, // { 306000, { 760024, -18195, 113 }, { } }, - // { 408000, { 789258, -19055, 113 }, { } }, - // { 510000, { 789258, -19915, 113 }, { } }, + { 408000, { 789258, -19055, 113 }, { } }, + { 510000, { 789258, -19915, 113 }, { } }, { 612000, { 789258, -19055, 113 }, { } }, { 714000, { 820558, -19915, 113 }, { } }, { 816000, { 853926, -20775, 113 }, { } }, @@ -198,16 +215,16 @@ volatile CustomizeTable C = { { 1785000, { 1145373, -26785, 113 }, { 1120000 } }, { 1887000, { 1195276, -27645, 113 }, { 1120000 } }, { 1963500, { 1274006, -29795, 113 }, { 1120000 } }, - { 2091000, { 1349076, -33235, 113 }, { 1375000 } }, - { 2193000, { 1386213, -33235, 113 }, { 1375000 } }, - { 2295000, { 1445416, -34095, 113 }, { 1375000 } }, - { 2397000, { 1490873, -34955, 113 }, { 1375000 } }, - { 2499000, { 1580725, -35815, 113 }, { 1375000 } }, - { 2601000, { 1702903, -36675, 113 }, { 1375000 } }, - { 2703000, { 1748360, -37535, 113 }, { 1375000 } }, - { 2805000, { 1793817, -38395, 113 }, { 1375000 } }, - { 2907000, { 1839274, -39255, 113 }, { 1375000 } }, - { 3009000, { 1884731, -40115, 113 }, { 1375000 } }, + { 2091000, { 1349076, -33235, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2193000, { 1386213, -33235, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2295000, { 1445416, -34095, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2397000, { 1490873, -34955, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2499000, { 1580725, -35815, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2601000, { 1702903, -36675, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2703000, { 1748360, -37535, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2805000, { 1793817, -38395, 113 }, { CPU_MAX_MAX_VOLT } }, + // { 2907000, { 1839274, -39255, 113 }, { CPU_MAX_MAX_VOLT } }, + // { 3009000, { 1884731, -40115, 113 }, { CPU_MAX_MAX_VOLT } }, }, /* - Erista GPU DVFS Table: @@ -326,11 +343,11 @@ volatile CustomizeTable C = { }, .marikoGpuDvfsTableSLT = { - { 76800, {}, { 590000, } }, - { 153600, {}, { 590000, } }, - { 230400, {}, { 590000, } }, - { 307200, {}, { 590000, } }, - { 384000, {}, { 590000, } }, + { 76800, {}, { 600000, } }, + { 153600, {}, { 600000, } }, + { 230400, {}, { 600000, } }, + { 307200, {}, { 600000, } }, + { 384000, {}, { 600000, } }, { 460800, {}, { 795089, -11096, -163, 298, -10421, 162 } }, { 537600, {}, { 795089, -11096, -163, 298, -10421, 162 } }, { 614400, {}, { 820606, -6285, -452, 238, -6182, 81 } }, @@ -368,7 +385,7 @@ volatile CustomizeTable C = { { 1382400, { }, { 1200812, -12688, -648, 0, 1077, 40 }, }, { 1420800, { }, { 1219396, -12688, -648, 0, 1077, 40 }, }, { 1459200, { }, { 1237980, -12688, -648, 0, 1077, 40 }, }, - { 1497600, { }, { 1256564, -10688, -648, 0, 1077, 40 }, }, + { 1497600, { }, { 1256564, -12688, -648, 0, 1077, 40 }, }, { 1536000, { }, { 1275148, -12688, -648, 0, 1077, 40 }, }, }, diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp index d1f0685a..8dcaa730 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp @@ -81,7 +81,7 @@ u32 marikoGpuVmax; u32 marikoGpuVoltArray[24]; - u32 eristaGpuVoltArray[14]; + u32 eristaGpuVoltArray[27]; CustomizeCpuDvfsTable eristaCpuDvfsTable; CustomizeCpuDvfsTable marikoCpuDvfsTable; diff --git a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp index 0c3f5650..62687b0e 100644 Binary files a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp and b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp differ diff --git a/dist/atmosphere/kips/hoc.kip b/dist/atmosphere/kips/hoc.kip index b7b0eedc..3873ff0f 100644 Binary files a/dist/atmosphere/kips/hoc.kip and b/dist/atmosphere/kips/hoc.kip differ