adjustor 2.1.6__tar.gz → 3.0.0__tar.gz

{adjustor-2.1.6/src/adjustor.egg-info → adjustor-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 2.1.6
+Version: 3.0.0
 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
@@ -15,6 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rich>=13.5.2
 Requires-Dist: pyroute2>=0.7.3
+Requires-Dist: fuse-python>=1.0.7
 
 # Adjustor
 Home of the Adjustor TDP plugin for Handheld Daemon.

{adjustor-2.1.6 → adjustor-3.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adjustor"
-version = "2.1.6"
+version = "3.0.0"
 authors = [
   { name="Kapenekakis Antheas", email="pypi@antheas.dev" },
 ]
@@ -18,6 +18,7 @@ classifiers = [
 dependencies = [
   "rich>=13.5.2",
   "pyroute2>=0.7.3",
+  "fuse-python>=1.0.7",
 ]
 
 [project.urls]

{adjustor-2.1.6 → adjustor-3.0.0}/src/adjustor/core/const.py

@@ -54,4 +54,5 @@ CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {
     "AMD Ryzen 7 6800U": (DEV_PARAMS_6040, 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.0.0/src/adjustor/drivers/amd/__init__.py

@@ -0,0 +1,97 @@
+import logging
+
+from hhd.plugins import Context, HHDPlugin, load_relative_yaml
+from hhd.plugins.conf import Config
+
+from adjustor.fuse.gpu import (
+    get_igpu_status,
+    set_gpu_auto,
+    set_gpu_manual,
+    set_cpu_boost,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class AmdGPUPlugin(HHDPlugin):
+
+    def __init__(
+        self,
+    ) -> None:
+        self.name = f"adjustor_gpu"
+        self.priority = 8
+        self.log = "agpu"
+        self.enabled = False
+        self.initialized = False
+        self.old_mode = None
+        self.old_freq = None
+        self.supports_boost = False
+        self.old_boost = None
+        self.logged_boost = False
+
+    def settings(self):
+        if not self.enabled:
+            self.initialized = False
+            return {}
+
+        status = get_igpu_status()
+        if not status:
+            logger.error("Could not get frequency status. Disabling AMD GPU plugin.")
+            return {}
+
+        self.initialized = True
+        sets = load_relative_yaml("./settings.yml")
+
+        freq = sets["children"]["level"]["modes"]["manual"]["children"]["frequency"]
+        freq["min"] = status.freq_min
+        freq["max"] = status.freq_max
+        freq["default"] = ((status.freq_min + status.freq_max) // 200) * 100
+
+        self.supports_boost = status.cpu_boost is not None
+        if self.supports_boost:
+            if not self.logged_boost:
+                logger.info(f"CPU Boost toggling is supported.")
+        else:
+            if not self.logged_boost:
+                logger.warning(f"CPU Boost toggling is not supported.")
+            del sets["children"]["cpu_boost"]
+        self.logged_boost = True
+        return {"tdp": {"amd_gpu": sets}}
+
+    def open(
+        self,
+        emit,
+        context: Context,
+    ):
+        self.emit = emit
+
+    def update(self, conf: Config):
+        self.enabled = conf["hhd.settings.tdp_enable"].to(bool)
+        if not self.initialized:
+            return
+
+        new_mode = conf["tdp.amd_gpu.level.mode"].to(str)
+        new_freq = conf["tdp.amd_gpu.level.manual.frequency"].to(int)
+        if new_mode != self.old_mode or new_freq != self.old_freq:
+            self.old_mode = new_mode
+            self.old_freq = new_freq
+
+            try:
+                if new_mode == "manual":
+                    set_gpu_manual(new_freq)
+                else:
+                    set_gpu_auto()
+            except Exception as e:
+                logger.error(f"Failed to set GPU mode:\n{e}")
+
+        if self.supports_boost:
+            new_boost = conf["tdp.amd_gpu.cpu_boost"].to(bool)
+            if new_boost != self.old_boost:
+                self.old_boost = new_boost
+                try:
+                    set_cpu_boost(new_boost)
+                except Exception as e:
+                    logger.error(f"Failed to set CPU boost:\n{e}")
+
+    def close(self):
+        pass

adjustor-3.0.0/src/adjustor/drivers/amd/settings.yml

@@ -0,0 +1,42 @@
+title: GPU Settings
+type: container
+tags: [ hide-title ]
+children:
+  level:
+    type: mode
+    title: GPU Frequency
+    hint: >-
+      Pins the GPU to a certain frequency.
+      Helps in certain games that are CPU or GPU heavy
+      by shifting power to or from the GPU.
+      Has a minor effect.
+    default: auto
+    modes:
+      auto:
+        type: container
+        title: Auto
+        hint: >-
+          Lets the GPU manage its own frequency.
+      manual:
+        type: container
+        title: Manual
+        hint: >-
+          Sets the GPU frequency manually.
+        children:
+          frequency:
+            title: Frequency
+            unit: MHz
+            type: int
+            min: 300
+            max: 2000
+            step: 100
+            default: 1000
+
+  cpu_boost:
+    type: bool
+    title: CPU Boost
+    default: True
+    hint: >-
+      Enables or disables the CPU boost frequencies.
+      Disabling lowers total consumption by 2W with 
+      minimal performance impact.

{adjustor-2.1.6 → adjustor-3.0.0}/src/adjustor/drivers/asus/__init__.py

@@ -1,11 +1,11 @@
 import logging
-import time
-from typing import cast
 import os
+import time
+from typing import Sequence
+
+from hhd.plugins import Config, Context, Event, HHDPlugin, load_relative_yaml
 
-from hhd.plugins import Context, HHDPlugin, load_relative_yaml
-from hhd.plugins.conf import Config
-from adjustor.core.platform import get_platform_choices, set_platform_profile
+from adjustor.core.platform import set_platform_profile
 
 logger = logging.getLogger(__name__)
 
@@ -123,6 +123,7 @@ class AsusDriverPlugin(HHDPlugin):
 
         self.queue_fan = None
         self.queue_tdp = None
+        self.new_tdp = None
 
     def settings(self):
         if not self.enabled:
@@ -198,7 +199,12 @@ class AsusDriverPlugin(HHDPlugin):
             pass
 
         # Check user changed values
-        steady = conf["tdp.asus.tdp"].to(int)
+        if self.new_tdp:
+            steady = self.new_tdp
+            self.new_tdp = None
+            conf["tdp.asus.tdp"] = steady
+        else:
+            steady = conf["tdp.asus.tdp"].to(int)
 
         steady_updated = steady and steady != self.old_conf["tdp"].to(int)
 
@@ -302,5 +308,10 @@ class AsusDriverPlugin(HHDPlugin):
         if self.startup:
             self.startup = False
 
+    def notify(self, events: Sequence[Event]):
+        for ev in events:
+            if ev["type"] == "tdp":
+                self.new_tdp = ev["tdp"]
+
     def close(self):
         pass

{adjustor-2.1.6 → adjustor-3.0.0}/src/adjustor/drivers/asus/settings.yml

@@ -113,14 +113,14 @@ children:
       p95: 95%
     default: disabled
   
-  disclaimer:
-    title: Sleep Bug
-    type: display
-    tags: [ non-essential ]
-    default: >-
-      There is an Asus kernel/BIOS bug that will sometimes limit TDP to 10W
-      after sleep.
-      As the kernel driver is used, this is unfixable from within
-      Handheld Daemon (currently investigated).
-      As an alternative, use SimpleDeckyTDP with RyzenAdj after
-      disabling TDP controls from "Settings".
+  # disclaimer:
+  #   title: Sleep Bug
+  #   type: display
+  #   tags: [ non-essential ]
+  #   default: >-
+  #     There is an Asus kernel/BIOS bug that will sometimes limit TDP to 10W
+  #     after sleep.
+  #     As the kernel driver is used, this is unfixable from within
+  #     Handheld Daemon (currently investigated).
+  #     As an alternative, use SimpleDeckyTDP with RyzenAdj after
+  #     disabling TDP controls from "Settings".

{adjustor-2.1.6 → adjustor-3.0.0}/src/adjustor/drivers/lenovo/__init__.py

@@ -1,8 +1,8 @@
 import logging
 import time
-from typing import cast
+from typing import Sequence, cast
 
-from hhd.plugins import Context, HHDPlugin, HHDSettings, load_relative_yaml
+from hhd.plugins import Context, Event, HHDPlugin, load_relative_yaml
 from hhd.plugins.conf import Config
 
 from adjustor.core.lenovo import (
@@ -24,8 +24,8 @@ from adjustor.core.lenovo import (
 
 logger = logging.getLogger(__name__)
 
-APPLY_DELAY = 2.2
-TDP_DELAY = 0.2
+APPLY_DELAY = 0.5
+TDP_DELAY = 0
 
 
 class LenovoDriverPlugin(HHDPlugin):
@@ -42,6 +42,7 @@ class LenovoDriverPlugin(HHDPlugin):
 
         self.queue_fan = None
         self.queue_tdp = None
+        self.new_tdp = None
 
     def settings(self):
         if not self.enabled:
@@ -119,7 +120,22 @@ class LenovoDriverPlugin(HHDPlugin):
         #
 
         # Update tdp mode if user changed through the app
-        mode = conf["tdp.lenovo.tdp.mode"].to(str)
+        new_tdp = self.new_tdp
+        self.new_tdp = None
+        if new_tdp:
+            # For TDP values received from steam, set the appropriate
+            # mode to get a better experience.
+            if new_tdp == 8:
+                mode = "quiet"
+            elif new_tdp == 15:
+                mode = "balanced"
+            elif new_tdp == 20:
+                mode = "performance"
+            else:
+                mode = "custom"
+            conf["tdp.lenovo.tdp.mode"] = mode
+        else:
+            mode = conf["tdp.lenovo.tdp.mode"].to(str)
         if mode is not None and mode != self.old_conf["tdp.mode"].to(str):
             set_tdp_mode(cast(TdpMode, mode))
             tdp_reset = True
@@ -146,6 +162,9 @@ class LenovoDriverPlugin(HHDPlugin):
         if new_mode == "custom":
             # Check user changed values
             steady = conf["tdp.lenovo.tdp.custom.tdp"].to(int)
+            if new_tdp:
+                steady = new_tdp
+                conf["tdp.lenovo.tdp.custom.tdp"] = steady
 
             old_steady = steady
             if self.enforce_limits:
@@ -243,5 +262,10 @@ class LenovoDriverPlugin(HHDPlugin):
         if self.startup:
             self.startup = False
 
+    def notify(self, events: Sequence[Event]):
+        for ev in events:
+            if ev["type"] == "tdp":
+                self.new_tdp = ev["tdp"]
+
     def close(self):
         pass

{adjustor-2.1.6 → adjustor-3.0.0}/src/adjustor/drivers/smu/__init__.py

@@ -1,11 +1,12 @@
 import logging
 import time
 
-from hhd.plugins import Context, HHDPlugin, load_relative_yaml
+from hhd.plugins import Context, HHDPlugin, load_relative_yaml, Event
 from hhd.plugins.conf import Config
 
 from adjustor.core.alib import AlibParams, DeviceParams, alib
 from adjustor.core.platform import get_platform_choices, set_platform_profile
+from typing import Sequence
 
 logger = logging.getLogger(__name__)
 
@@ -35,6 +36,7 @@ class SmuQamPlugin(HHDPlugin):
 
         self.old_tdp = None
         self.old_boost = None
+        self.new_tdp = None
         self.is_set = False
         self.lims = self.dev.get("skin_limit", self.dev.get("stapm_limit", None))
 
@@ -97,7 +99,13 @@ class SmuQamPlugin(HHDPlugin):
             return
 
         curr = time.time()
-        new_tdp = conf["tdp.qam.tdp"].to(int)
+        if self.new_tdp:
+            new_tdp = self.new_tdp
+            self.new_tdp = None
+            conf["tdp.qam.tdp"] = new_tdp
+        else:
+            new_tdp = conf["tdp.qam.tdp"].to(int)
+
         if self.startup and self.lims:
             _, smin, _, smax, _ = self.lims
             if smin and new_tdp < smin:
@@ -313,5 +321,10 @@ class SmuDriverPlugin(HHDPlugin):
         else:
             conf["tdp.smu.status"] = "Not Set"
 
+    def notify(self, events: Sequence[Event]):
+        for ev in events:
+            if ev["type"] == "tdp":
+                self.new_tdp = ev["tdp"]
+
     def close(self):
         pass

{adjustor-2.1.6 → adjustor-3.0.0}/src/adjustor/events.py

@@ -9,8 +9,8 @@ from pyroute2 import AcpiEventSocket  # type: ignore
 logger = logging.getLogger(__name__)
 
 EVENT_MATCHES: Sequence[tuple[dict[str, Any], str]] = [
-    ({"device_class": "ac_adapter", "data": 0}, "dc"),
-    ({"device_class": "ac_adapter", "data": 256}, "ac"),
+    ({"device_class": b"ac_adapter", "data": 0}, "dc"),
+    ({"device_class": b"ac_adapter", "data": 256}, "ac"),
     ({"device_class": b"battery"}, "battery"),
     # Legion GO TDP event
     ({"bus_id": b"D320289E-8FEA-"}, "tdp"),
@@ -44,7 +44,7 @@ def loop_process_events(emit: Emitter, should_exit: TEvent):
 
                     if matches:
                         if etype != "battery":
-                            emit({"type": "acpi", "event": etype})
+                            emit({"type": "acpi", "event": etype}) # type: ignore
                         found = True
                         break
 

adjustor-3.0.0/src/adjustor/fuse/__init__.py

@@ -0,0 +1,3 @@
+from .utils import start_tdp_client, prepare_tdp_mount
+
+__all__ = ["start_tdp_client", "prepare_tdp_mount"]