adjustor 3.4.5__tar.gz → 3.4.7__tar.gz

{adjustor-3.4.5/src/adjustor.egg-info → adjustor-3.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.4.5
+Version: 3.4.7
 Summary: Adjustor, a userspace program for managing the TDP of handheld devices.
 Author-email: Kapenekakis Antheas <pypi@antheas.dev>
 Project-URL: Homepage, https://github.com/hhd-dev/adjustor

{adjustor-3.4.5 → adjustor-3.4.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adjustor"
-version = "3.4.5"
+version = "3.4.7"
 authors = [
   { name="Kapenekakis Antheas", email="pypi@antheas.dev" },
 ]

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/core/const.py

@@ -25,11 +25,12 @@ ALIB_PARAMS = {
     "temp_target": A(0x03, 0, 105),
 }
 
+ALIB_PARAMS_5040: dict[str, AlibParams] = ALIB_PARAMS
 ALIB_PARAMS_7040: dict[str, AlibParams] = ALIB_PARAMS
 ALIB_PARAMS_6040: dict[str, AlibParams] = ALIB_PARAMS
 ALIB_PARAMS_8040: dict[str, AlibParams] = ALIB_PARAMS
 
-DEV_PARAMS_7040: dict[str, DeviceParams] = {
+DEV_PARAMS_30W: dict[str, DeviceParams] = {
     "stapm_limit": D(0, 4, 15, 30, 40),
     "skin_limit": D(0, 4, 15, 30, 40),
     "slow_limit": D(0, 4, 20, 32, 43),
@@ -52,10 +53,23 @@ DEV_PARAMS_28W: dict[str, DeviceParams] = {
     # Temp
     "temp_target": D(60, 70, 85, 90, 100),
 }
+DEV_PARAMS_25W: dict[str, DeviceParams] = {
+    "stapm_limit": D(0, 4, 15, 25, 32),
+    "skin_limit": D(0, 4, 15, 25, 32),
+    "slow_limit": D(0, 4, 20, 27, 35),
+    "fast_limit": D(0, 4, 25, 30, 37),
+    # Times
+    "slow_time": D(5, 5, 10, 10, 10),
+    "stapm_time": D(100, 100, 100, 200, 200),
+    # Temp
+    "temp_target": D(60, 70, 85, 90, 100),
+}
 
-DEV_PARAMS_6040: dict[str, DeviceParams] = DEV_PARAMS_7040
-DEV_PARAMS_8040: dict[str, DeviceParams] = DEV_PARAMS_7040
-DEV_PARAMS_LEGO = DEV_PARAMS_7040
+DEV_PARAMS_5000: dict[str, DeviceParams] = DEV_PARAMS_25W
+DEV_PARAMS_6000: dict[str, DeviceParams] = DEV_PARAMS_30W
+DEV_PARAMS_7040: dict[str, DeviceParams] = DEV_PARAMS_30W
+DEV_PARAMS_8040: dict[str, DeviceParams] = DEV_PARAMS_30W
+DEV_PARAMS_LEGO = DEV_PARAMS_30W
 
 DEV_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams], bool]] = {
     "NEO-01": (DEV_PARAMS_28W, ALIB_PARAMS_7040, False),
@@ -69,7 +83,8 @@ CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {
     # GPD Win 4
     # model name    : AMD Ryzen 7 6800U with Radeon Graphics
     # 28W works fine, 30W is pushing it
-    "AMD Ryzen 7 6800U": (DEV_PARAMS_6040, ALIB_PARAMS_6040),
+    "AMD Ryzen 7 5800U": (DEV_PARAMS_6000, ALIB_PARAMS_6040),
+    "AMD Ryzen 7 6800U": (DEV_PARAMS_6000, ALIB_PARAMS_6040),
     "AMD Ryzen 7 7840U": (DEV_PARAMS_7040, ALIB_PARAMS_7040),
     "AMD Ryzen 7 8840U": (DEV_PARAMS_8040, ALIB_PARAMS_8040),
     # AMD Athlon Silver 3050e (Win600, will it support tdp?)

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/drivers/asus/__init__.py

@@ -13,10 +13,10 @@ logger = logging.getLogger(__name__)
 APPLY_DELAY = 0.7
 TDP_DELAY = 0.1
 SLEEP_DELAY = 4
-MIN_TDP_START = 7
-MAX_TDP_START = 30
+MIN_TDP = 7
+MAX_TDP = 30
 # FIXME: add AC/DC values
-MAX_TDP = 35
+MAX_TDP_BOOST = 35
 
 FTDP_FN = "/sys/devices/platform/asus-nb-wmi/ppt_fppt"
 STDP_FN = "/sys/devices/platform/asus-nb-wmi/ppt_pl2_sppt"
@@ -139,6 +139,7 @@ class AsusDriverPlugin(HHDPlugin):
 
         self.queue_fan = None
         self.queue_tdp = None
+        self.queue_charge_limit = None
         self.new_tdp = None
         self.new_mode = None
         self.old_target = None
@@ -206,6 +207,10 @@ class AsusDriverPlugin(HHDPlugin):
         if (self.startup and lim != "disabled") or (
             lim != self.old_conf["charge_limit"].to(str)
         ):
+            self.queue_charge_limit = curr + APPLY_DELAY
+        
+        if self.queue_charge_limit and self.queue_charge_limit < curr:
+            self.queue_charge_limit = None
             match lim:
                 case "p65":
                     set_charge_limit(65)
@@ -237,14 +242,15 @@ class AsusDriverPlugin(HHDPlugin):
         if new_tdp:
             # For TDP values received from steam, set the appropriate
             # mode to get a better experience.
-            if new_tdp == (13 if ally_x else 10):
-                mode = "quiet"
-            elif new_tdp == (17 if ally_x else 15):
-                mode = "balanced"
-            elif new_tdp == 25 or new_tdp == 30:
-                mode = "performance"
-            else:
-                mode = "custom"
+            # if new_tdp == (13 if ally_x else 10):
+            #     mode = "quiet"
+            # elif new_tdp == (17 if ally_x else 15):
+            #     mode = "balanced"
+            # elif new_tdp == 25 or new_tdp == 30:
+            #     mode = "performance"
+            # else:
+            #     mode = "custom"
+            mode = "custom"
             conf["tdp.asus.tdp_v2.mode"] = mode
         elif new_mode:
             mode = new_mode
@@ -281,6 +287,14 @@ class AsusDriverPlugin(HHDPlugin):
             else:
                 steady = conf["tdp.asus.tdp_v2.custom.tdp"].to(int)
 
+            if self.enforce_limits:
+                if steady < MIN_TDP:
+                    steady = MIN_TDP
+                    conf["tdp.asus.tdp_v2.custom.tdp"] = steady
+                elif steady > MAX_TDP:
+                    steady = MAX_TDP
+                    conf["tdp.asus.tdp_v2.custom.tdp"] = steady
+
             steady_updated = steady and steady != self.old_conf["tdp_v2.custom.tdp"].to(
                 int
             )
@@ -289,11 +303,11 @@ class AsusDriverPlugin(HHDPlugin):
 
             steady_updated |= tdp_reset
 
-            if self.startup and (steady > MAX_TDP_START or steady < MIN_TDP_START):
+            if self.startup and (steady > MAX_TDP or steady < MIN_TDP):
                 logger.warning(
                     f"TDP ({steady}) outside the device spec. Resetting for stability reasons."
                 )
-                steady = min(max(steady, MIN_TDP_START), MAX_TDP_START)
+                steady = min(max(steady, MIN_TDP), MAX_TDP)
                 conf["tdp.asus.tdp_v2.custom.tdp"] = steady
                 steady_updated = True
 
@@ -326,13 +340,13 @@ class AsusDriverPlugin(HHDPlugin):
                     set_tdp(
                         "fast",
                         FTDP_FN,
-                        min(max(steady, MAX_TDP), int(steady * 35 / 25)),
+                        min(max(steady, MAX_TDP_BOOST), int(steady * 35 / 25)),
                     )
                     time.sleep(TDP_DELAY)
                     set_tdp(
                         "slow",
                         STDP_FN,
-                        min(max(steady, MAX_TDP), int(steady * 30 / 25)),
+                        min(max(steady, MAX_TDP_BOOST), int(steady * 30 / 25)),
                     )
                     time.sleep(TDP_DELAY)
                     set_tdp("steady", CTDP_FN, steady)

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/drivers/asus/settings.yml

@@ -48,7 +48,7 @@ children:
   sys_tdp:
     type: display
     title: " "
-    tags: [non-essential]
+    tags: []
 
   cycle_tdp:
     type: bool

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/drivers/general/__init__.py

@@ -7,6 +7,7 @@ import time
 import signal
 from hhd.plugins import Context, HHDPlugin, load_relative_yaml
 from hhd.plugins.conf import Config
+from threading import Event
 import logging
 
 logger = logging.getLogger(__name__)
@@ -16,6 +17,7 @@ class GeneralPowerPlugin(HHDPlugin):
 
     def __init__(
         self,
+        is_steamdeck: bool = False,
     ) -> None:
         self.name = f"adjustor_general"
         self.priority = 8
@@ -25,6 +27,10 @@ class GeneralPowerPlugin(HHDPlugin):
         self.old_sched = None
         self.sched_proc = None
         self.ppd_supported = None
+        self.is_steamdeck = is_steamdeck
+        self.ovr_enabled = False
+        self.should_exit = Event()
+        self.t_sys = None
 
     def settings(self):
         sets = load_relative_yaml("./settings.yml")
@@ -71,6 +77,9 @@ class GeneralPowerPlugin(HHDPlugin):
         else:
             del sets["children"]["sched"]
 
+        if not self.is_steamdeck:
+            del sets["children"]["steamdeck_ovr"]
+
         self.logged_boost = True
         return {
             "tdp": {"general": sets},
@@ -134,6 +143,24 @@ class GeneralPowerPlugin(HHDPlugin):
                         stderr=subprocess.DEVNULL,
                         stdout=subprocess.DEVNULL,
                     )
+        
+        # Handle steamdeck_ovr
+        if self.is_steamdeck:
+            new_ovr = conf.get("tdp.general.steamdeck_ovr", False)
+            if new_ovr and not self.ovr_enabled:
+                self.ovr_enabled = True
+                logger.info("Starting FUSE mount for /sys (Overclock).")
+                from ...fuse import prepare_tdp_mount, start_tdp_client
+
+                stat = prepare_tdp_mount(passhtrough=True)
+                if stat:
+                    self.t_sys = start_tdp_client(
+                        self.should_exit,
+                        None,
+                        1,
+                        15,
+                        20,
+                    )
 
     def close_sched(self):
         if self.sched_proc is not None:
@@ -144,3 +171,6 @@ class GeneralPowerPlugin(HHDPlugin):
 
     def close(self):
         self.close_sched()
+        if self.t_sys:
+            self.should_exit.set()
+            self.t_sys.join()

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/drivers/general/settings.yml

@@ -25,3 +25,12 @@ children:
       scx_bpfland: bpfland 
       scx_rusty: rusty
     default: disabled
+
+  steamdeck_ovr:
+    type: bool
+    tags: [advanced,expert]
+    title: Steamdeck Overclock (Requires Reboot)
+    hint: >-
+      Allows setting the Steam TDP slider from 1-20W instead of 4-15W.
+      Unchecked, it is still setting TDP to 15W.
+    default: False

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/drivers/smu/qam.yml

@@ -18,4 +18,4 @@ children:
   sys_tdp:
     type: display
     title: " "
-    tags: [non-essential]
+    tags: []

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/fuse/driver.py

@@ -157,7 +157,7 @@ class Xmp(Fuse):
     def fsinit(self):
         os.chdir(self.root)
 
-    def main(self, *a, **kw):
+    def main(self, *a, passthrough=False, **kw):
         os.makedirs(FUSE_MOUNT_DIR, exist_ok=True)
         sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@@ -167,6 +167,7 @@ class Xmp(Fuse):
         self.file_class = XmpFile
         XmpFile.h = Handler(sock)
         XmpFile.cache = {}
+        XmpFile.passthrough = passthrough
 
         code = Fuse.main(self, *a, **kw)
         sock.close()
@@ -196,10 +197,15 @@ class Handler:
 class XmpFile:
     h: Handler
     cache: dict[str, bytes]
+    passthrough: bool
 
     def __init__(self, path, flags, *mode):
         self.path = path
-        if "power1_cap" in path or "power2_cap" in path:
+        power_attr = "power1_cap" in path or "power2_cap" in path
+        # Allow passing through writes if we are the steam deck
+        passthrough = XmpFile.passthrough and path.endswith("_cap")
+
+        if power_attr and not passthrough:
             print(f"GPU Attribute access: {path} {flags} {mode}")
 
             # Receive file contents from hhd
@@ -373,6 +379,13 @@ def main():
             default="/",
             help="GPU device private bind mount point",
         )
+        server.parser.add_option(
+            mountopt="passthrough",
+            metavar="PASSTHROUGH",
+            action="store_true",
+            default=False,
+            help="Allow tdp write passthrough, e.g., for the Steam Deck.",
+        )
         server.parse(values=server, errex=1)
 
         try:
@@ -382,7 +395,7 @@ def main():
             print("can't enter root of underlying filesystem", file=sys.stderr)
             sys.exit(1)
 
-        server.main()
+        server.main(passthrough=getattr(server, "passthrough", False))
     except KeyboardInterrupt:
         pass
     finally:

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/fuse/utils.py

@@ -37,7 +37,7 @@ def find_igpu():
     return None
 
 
-def prepare_tdp_mount(debug: bool = False):
+def prepare_tdp_mount(debug: bool = False, passhtrough: bool = False):
     try:
         gpu = find_igpu()
         logger.info(f"Found GPU at:\n'{gpu}'")
@@ -53,9 +53,13 @@ def prepare_tdp_mount(debug: bool = False):
 
         if not os.path.ismount(TDP_MOUNT):
             logger.info(f"Creating bind mount for:\n'{gpu}'\nto:\n'{TDP_MOUNT}'")
-            os.system(f"mount --bind '{gpu}' '{TDP_MOUNT}'")
+            cmd = f"mount --bind '{gpu}' '{TDP_MOUNT}'"
+            r = os.system(cmd)
+            assert not r, f"Failed:\n{cmd}"
             logger.info(f"Making bind mount private.")
-            os.system(f"mount --make-private '{TDP_MOUNT}'")
+            cmd = f"mount --make-private '{TDP_MOUNT}'"
+            r = os.system(cmd)
+            assert not r, f"Failed:\n{cmd}"
         else:
             logger.info(f"Bind mount already exists at:\n'{TDP_MOUNT}'")
 
@@ -68,9 +72,12 @@ def prepare_tdp_mount(debug: bool = False):
             f"{exe_python} -m adjustor.fuse.driver '{gpu}'"
             + f" -o root={TDP_MOUNT} -o nonempty -o allow_other"
         )
+        if passhtrough:
+            cmd += " -o passthrough"
         if debug:
             cmd += " -f"
-        os.system(cmd)
+        r = os.system(cmd)
+        assert not r, f"Failed:\n{cmd}"
     except Exception as e:
         logger.error(f"Error preparing fuse mount:\n{e}")
         return False
@@ -156,7 +163,7 @@ def _tdp_client(should_exit: Event, set_tdp, min_tdp, default_tdp, max_tdp):
 def start_tdp_client(
     should_exit: Event, emit, min_tdp: int, default_tdp: int, max_tdp: int
 ):
-    set_tdp = lambda tdp: emit({"type": "tdp", "tdp": tdp})
+    set_tdp = lambda tdp: emit and emit({"type": "tdp", "tdp": tdp})
 
     logger.info(f"Starting TDP client on socket:\n'{FUSE_MOUNT_SOCKET}'")
     t = Thread(

{adjustor-3.4.5 → adjustor-3.4.7}/src/adjustor/hhd.py

@@ -269,6 +269,7 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     ):
         drivers.append(AsusDriverPlugin("RC72L" in prod))
         drivers_matched = True
+        min_tdp = 7
 
     if os.environ.get("HHD_ADJ_DEBUG") or os.environ.get("HHD_ENABLE_SMU"):
         drivers_matched = False
@@ -326,7 +327,9 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
         from .drivers.general import GeneralPowerPlugin
 
         logger.info(f"No tdp drivers found for this device, using generic plugin.")
-        return [GeneralPowerPlugin()]
+        
+        is_steamdeck = "Jupiter" in prod or "Galileo" in prod
+        return [GeneralPowerPlugin(is_steamdeck=is_steamdeck)]
 
     return [
         *drivers,

{adjustor-3.4.5 → adjustor-3.4.7/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.4.5
+Version: 3.4.7
 Summary: Adjustor, a userspace program for managing the TDP of handheld devices.
 Author-email: Kapenekakis Antheas <pypi@antheas.dev>
 Project-URL: Homepage, https://github.com/hhd-dev/adjustor