adjustor 0.1.1__tar.gz → 0.2.0__tar.gz

{adjustor-0.1.1/src/adjustor.egg-info → adjustor-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 0.1.1
+Version: 0.2.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
@@ -35,22 +35,35 @@ As part of the latest Lenovo bios, it also allows for setting a custom fan curve
 for the Legion Go.
 
 ## AMD TDP Control
-Adjustor controls TDP through the Dynamic Power and Thermal Configuration Interface, 
-which exposes a superset of the parameters that can be found in 
+Adjustor controls TDP through the Dynamic Power and Thermal Configuration Interface
+of AMD, which exposes a superset of the parameters that can be currently found in 
 [RyzenAdj](https://github.dev/FlyGoat/RyzenAdj/), through ACPI.
-This vendor function is part of the ACPI ASL library, and provided through the
+This vendor interface is part of the ACPI ASL library, and provided through the
 ALIB method 0x0C.
+The underlying implementation of the interface is SMU calls.
 This means that as long as the kernel module `acpi_call` is loaded, Adjustor
 can control TDP in an equivalent way to [RyzenAdj](https://github.dev/FlyGoat/RyzenAdj/).
 
-ALIB does not provide a way for reading the performance metrics table, so 
-Adjustor can only write TDP values.
+Right now, Adjustor only implements a subset of useful ALIB parameters that are
+well documented.
+In addition, ALIB does not provide a way for reading the performance metrics table, 
+so Adjustor can only write (not read) TDP values.
 From reverse engineering the Legion Go (see [here](./alib.md)), and seeing how it
 interacts with ALIB, it was found that there are at least 10 parameters which control
 the method STTv2 and are not part of RyzenAdj or have been documented elsewhere.
 
 ## Installation
-Installation instructions coming the following days.
+Adjustor is available on [AUR](https://aur.archlinux.org/packages/adjustor)
+and provided Handheld Daemon has been installed through 
+[AUR](https://aur.archlinux.org/packages/hhd) too, it will load it automatically
+on restart.
+COPR coming soon.
+
+Alternatively, on a local install of Handheld Daemon you may:
+```bash
+~/.local/share/hhd/venv/bin/pip install --upgrade adjustor
+```
+However, the autoupdater in Handheld Daemon does not support updating yet.
 
 ## Development
 Install to the same virtual environment as hhd to have Adjustor picked up

{adjustor-0.1.1 → adjustor-0.2.0}/pyproject.toml

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

{adjustor-0.1.1 → adjustor-0.2.0}/readme.md

@@ -18,22 +18,35 @@ As part of the latest Lenovo bios, it also allows for setting a custom fan curve
 for the Legion Go.
 
 ## AMD TDP Control
-Adjustor controls TDP through the Dynamic Power and Thermal Configuration Interface, 
-which exposes a superset of the parameters that can be found in 
+Adjustor controls TDP through the Dynamic Power and Thermal Configuration Interface
+of AMD, which exposes a superset of the parameters that can be currently found in 
 [RyzenAdj](https://github.dev/FlyGoat/RyzenAdj/), through ACPI.
-This vendor function is part of the ACPI ASL library, and provided through the
+This vendor interface is part of the ACPI ASL library, and provided through the
 ALIB method 0x0C.
+The underlying implementation of the interface is SMU calls.
 This means that as long as the kernel module `acpi_call` is loaded, Adjustor
 can control TDP in an equivalent way to [RyzenAdj](https://github.dev/FlyGoat/RyzenAdj/).
 
-ALIB does not provide a way for reading the performance metrics table, so 
-Adjustor can only write TDP values.
+Right now, Adjustor only implements a subset of useful ALIB parameters that are
+well documented.
+In addition, ALIB does not provide a way for reading the performance metrics table, 
+so Adjustor can only write (not read) TDP values.
 From reverse engineering the Legion Go (see [here](./alib.md)), and seeing how it
 interacts with ALIB, it was found that there are at least 10 parameters which control
 the method STTv2 and are not part of RyzenAdj or have been documented elsewhere.
 
 ## Installation
-Installation instructions coming the following days.
+Adjustor is available on [AUR](https://aur.archlinux.org/packages/adjustor)
+and provided Handheld Daemon has been installed through 
+[AUR](https://aur.archlinux.org/packages/hhd) too, it will load it automatically
+on restart.
+COPR coming soon.
+
+Alternatively, on a local install of Handheld Daemon you may:
+```bash
+~/.local/share/hhd/venv/bin/pip install --upgrade adjustor
+```
+However, the autoupdater in Handheld Daemon does not support updating yet.
 
 ## Development
 Install to the same virtual environment as hhd to have Adjustor picked up

{adjustor-0.1.1 → adjustor-0.2.0}/src/adjustor/core/const.py

@@ -1,5 +1,12 @@
 from .alib import A, D, DeviceParams, AlibParams
 
+ROG_ALLY_PP_MAP = [
+    ("low-power", 0),
+    ("quiet", 0),
+    ("balanced", 13),
+    ("performance", 20),
+]
+
 ALIB_PARAMS = {
     # TDPs
     "stapm_limit": A(0x05, 0, 54, 1000),
@@ -32,9 +39,14 @@ DEV_PARAMS_6040: dict[str, DeviceParams] = DEV_PARAMS_7040
 
 DEV_PARAMS_LEGO = DEV_PARAMS_7040
 
+DEV_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams], bool]] = {
+    "NEO-01": (DEV_PARAMS_7040, ALIB_PARAMS_7040, False),
+    "83E1": (DEV_PARAMS_LEGO, ALIB_PARAMS_7040, False),
+}
+
 CPU_DATA: dict[str, tuple[dict[str, DeviceParams], dict[str, AlibParams]]] = {
     "AMD Ryzen Z1 Extreme": (DEV_PARAMS_7040, ALIB_PARAMS_7040),
-    "AMD Ryzen 7 7800U": (DEV_PARAMS_7040, ALIB_PARAMS_7040),
+    "AMD Ryzen 7 7840U": (DEV_PARAMS_7040, ALIB_PARAMS_7040),
     # GPD Win 4
     # model name    : AMD Ryzen 7 6800U with Radeon Graphics
     # 28W works fine, 30W is pushing it

{adjustor-0.1.1 → adjustor-0.2.0}/src/adjustor/drivers/lenovo/settings.yml

@@ -57,8 +57,6 @@ children:
       modes at your own risk.
 
       This fan curve needs to be reapplied every time you switch TDP modes.
-      Adjustor will automatically apply it for changes made through the UI
-      but not with Legion L + Y.
     default: disabled
     modes:
       disabled:

{adjustor-0.1.1 → adjustor-0.2.0}/src/adjustor/drivers/smu/__init__.py

@@ -1,4 +1,5 @@
 import logging
+import time
 
 from hhd.plugins import Context, HHDPlugin, load_relative_yaml
 from hhd.plugins.conf import Config
@@ -38,10 +39,15 @@ def get_platform_profile():
         return None
 
 
+PP_DELAY = 0.2
+
+
 class SmuQamPlugin(HHDPlugin):
 
     def __init__(
-        self, dev: dict[str, DeviceParams], platform_profile: bool = True
+        self,
+        dev: dict[str, DeviceParams],
+        pp_map: list[tuple[str, int]] | None,
     ) -> None:
         self.name = f"adjustor_smu_qam"
         self.priority = 7
@@ -53,14 +59,16 @@ class SmuQamPlugin(HHDPlugin):
         self.emit = None
         self.old_conf = None
 
-        self.check_pp = platform_profile
-        self.old_pp = None
-        self.has_pp = False
-
         self.old_tdp = None
         self.old_boost = None
         self.is_set = False
 
+        self.pp_map = pp_map
+        if pp_map:
+            self.pps = get_platform_choices() or []
+        else:
+            self.pps = []
+
     def settings(self):
         if not self.enabled:
             self.initialized = False
@@ -69,18 +77,6 @@ class SmuQamPlugin(HHDPlugin):
         self.initialized = True
         out = {"tdp": {"qam": load_relative_yaml("qam.yml")}}
 
-        # Limit platform profile choices or remove
-        choices = get_platform_choices()
-        if choices and self.check_pp:
-            options = out["tdp"]["qam"]["children"]["platform_profile"]["options"]
-            for c in list(options):
-                if c not in choices:
-                    del options[c]
-            self.has_pp = True
-        else:
-            del out["tdp"]["qam"]["children"]["platform_profile"]
-            self.has_pp = False
-
         # Set device limits based on stapm
         lims = self.dev.get("skin_limit", self.dev.get("stapm_limit", None))
         assert (
@@ -112,17 +108,6 @@ class SmuQamPlugin(HHDPlugin):
         if not self.enabled or not self.initialized:
             return
 
-        if self.has_pp:
-            cpp = conf["tdp.qam.platform_profile"].to(str)
-
-            if cpp and cpp != self.old_pp:
-                logger.info(f"Setting platform profile to '{cpp}'")
-                set_platform_profile(cpp)
-
-            pp = get_platform_profile()
-            conf["tdp.qam.platform_profile"] = pp
-            self.old_pp = pp
-
         new_tdp = conf["tdp.qam.tdp"].to(int)
         new_boost = conf["tdp.qam.boost"].to(bool)
         changed = (
@@ -135,6 +120,14 @@ class SmuQamPlugin(HHDPlugin):
 
             conf["tdp.smu.std.skin_limit"] = new_tdp
             conf["tdp.smu.std.stapm_limit"] = new_tdp
+
+            if self.pp_map and conf["tdp.smu.platform_profile"].to(str) != "disabled":
+                pp = self.pp_map[0][0]
+                for npp, tdp in self.pp_map:
+                    if tdp < new_tdp and npp in self.pps:
+                        pp = npp
+                conf["tdp.smu.platform_profile"] = pp
+
             if new_boost:
                 try:
                     fmax = self.dev["fast_limit"].smax
@@ -174,6 +167,7 @@ class SmuDriverPlugin(HHDPlugin):
         self,
         dev: dict[str, DeviceParams],
         cpu: dict[str, AlibParams],
+        platform_profile: bool = True,
     ) -> None:
         self.name = f"adjustor_smu"
         self.priority = 9
@@ -185,7 +179,11 @@ class SmuDriverPlugin(HHDPlugin):
         self.dev = dev
         self.cpu = cpu
 
+        self.check_pp = platform_profile
+        self.has_pp = False
+        self.old_pp = None
         self.old_vals = {}
+        self.is_set = False
 
         for k in dev:
             assert (
@@ -203,6 +201,18 @@ class SmuDriverPlugin(HHDPlugin):
             }
         }
 
+        # Limit platform profile choices or remove
+        choices = get_platform_choices()
+        if choices and self.check_pp:
+            options = out["tdp"]["smu"]["children"]["platform_profile"]["options"]
+            for c in list(options):
+                if c not in choices and c != "disabled":
+                    del options[c]
+            self.has_pp = True
+        else:
+            del out["tdp"]["smu"]["children"]["platform_profile"]
+            self.has_pp = False
+
         # Remove unsupported instructions
         # Add absolute limits based on CPU
         std = out["tdp"]["smu"]["children"]["std"]["children"]
@@ -270,19 +280,37 @@ class SmuDriverPlugin(HHDPlugin):
                     new_vals[k] = v
 
         if set(new_vals.items()) != set(self.old_vals.items()):
-            conf["tdp.smu.status"] = "Not Set"
+            self.is_set = False
+
+        if self.has_pp:
+            new_pp = conf["tdp.smu.platform_profile"].to(str)
+            if new_pp != self.old_pp and new_pp != "disabled":
+                self.is_set = False
+            self.old_pp = new_pp
 
         if conf["tdp.smu.apply"].to(bool):
             conf["tdp.smu.apply"] = False
+
+            if self.has_pp:
+                cpp = conf["tdp.smu.platform_profile"].to(str)
+                if cpp != "disabled":
+                    logger.info(f"Setting platform profile to '{cpp}'")
+                    set_platform_profile(cpp)
+                    time.sleep(PP_DELAY)
+
             alib(
                 new_vals,
                 self.cpu,
                 limit="device" if self.enforce_limits else "cpu",
                 dev=self.dev,
             )
-            conf["tdp.smu.status"] = "Set"
+            self.is_set = True
 
         self.old_vals = new_vals
+        if self.is_set:
+            conf["tdp.smu.status"] = "Set"
+        else:
+            conf["tdp.smu.status"] = "Not Set"
 
     def close(self):
         pass

{adjustor-0.1.1 → adjustor-0.2.0}/src/adjustor/drivers/smu/qam.yml

@@ -1,17 +1,6 @@
 title: Quick Settings
 type: container
 children:
-  platform_profile:
-    type: multiple
-    title: Platform Profile
-    options:
-      low-power: Low Power
-      cool: Cool
-      quiet: Quiet
-      balanced: Balanced
-      balanced-performance: Balanced Performance
-      performance: Performance
-
   tdp:
     title: TDP
     hint: >-

{adjustor-0.1.1 → adjustor-0.2.0}/src/adjustor/drivers/smu/smu.yml

@@ -1,11 +1,11 @@
 type: container
-title: Ryzen SMU Configurator
+title: Advanced Configurator
 tags: [advanced, expert]
 hint: >-
 children:
   apply:
     type: action
-    title: Apply SMU Settings
+    title: Apply Settings
 
   status:
     title: TDP Status
@@ -14,6 +14,19 @@ children:
     choices:
       uninit: Not Set
       init: Set
+  
+  platform_profile:
+    type: multiple
+    title: Platform Profile
+    default: balanced
+    options:
+      disabled: Not Set
+      low-power: Low Power
+      cool: Cool
+      quiet: Quiet
+      balanced: Balanced
+      balanced-performance: Balanced Performance
+      performance: Performance
 
   std:
     tags: [advanced]

{adjustor-0.1.1 → adjustor-0.2.0}/src/adjustor/hhd.py

@@ -1,7 +1,7 @@
 from adjustor.core.acpi import initialize, check_perms
 
 from typing import Sequence
-from adjustor.core.const import CPU_DATA
+from adjustor.core.const import CPU_DATA, ROG_ALLY_PP_MAP, DEV_DATA
 
 import os
 from hhd.plugins import (
@@ -56,7 +56,10 @@ class AdjustorPlugin(HHDPlugin):
         self.enfoce_limits = True
 
     def settings(self) -> HHDSettings:
-        return {"tdp": {"general": load_relative_yaml("settings.yml")}}
+        out = {"tdp": {"general": load_relative_yaml("settings.yml")}}
+        if os.environ.get("HHD_ADJ_ENABLE_TDP"):
+            out['tdp']['general']['children']['enable']['default'] = True
+        return out
 
     def open(
         self,
@@ -91,27 +94,40 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
         cpuinfo = f.read().strip()
 
     drivers_matched = False
-    legion_go = False
     if prod == "83E1":
         drivers.append(LenovoDriverPlugin())
         drivers_matched = True
-        legion_go = True
 
-    if (
-        os.environ.get("HHD_ADJ_DEBUG")
-        or os.environ.get("HHD_ENABLE_SMU")
-        or not drivers_matched
-    ):
+    if os.environ.get("HHD_ADJ_DEBUG") or os.environ.get("HHD_ENABLE_SMU"):
+        drivers_matched = False
+
+    if not drivers_matched and prod in DEV_DATA:
+        dev, cpu, pp_enable = DEV_DATA[prod]
+        pp_enable |= bool(os.environ.get("HHD_ADJ_DEBUG"))
+        drivers.append(
+            SmuDriverPlugin(
+                dev,
+                cpu,
+                platform_profile=pp_enable,
+            )
+        )
+        drivers.append(
+            SmuQamPlugin(dev, ROG_ALLY_PP_MAP if pp_enable else None),
+        )
+        drivers_matched = True
+
+    if not drivers_matched:
         for name, (dev, cpu) in CPU_DATA.items():
             if name in cpuinfo:
-                drivers.append(SmuDriverPlugin(dev, cpu))
                 drivers.append(
-                    SmuQamPlugin(
+                    SmuDriverPlugin(
                         dev,
-                        platform_profile=(
-                            not legion_go or bool(os.environ.get("HHD_ADJ_DEBUG"))
-                        ),
-                    ),
+                        cpu,
+                        platform_profile=True,
+                    )
+                )
+                drivers.append(
+                    SmuQamPlugin(dev, ROG_ALLY_PP_MAP),
                 )
                 break
 

{adjustor-0.1.1 → adjustor-0.2.0}/src/adjustor/settings.yml

@@ -10,6 +10,7 @@ children:
   enforce_limits:
     title: Enforce Device Limits
     type: bool
+    tags: [ expert ]
     default: True
 
   error:

{adjustor-0.1.1 → adjustor-0.2.0/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 0.1.1
+Version: 0.2.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
@@ -35,22 +35,35 @@ As part of the latest Lenovo bios, it also allows for setting a custom fan curve
 for the Legion Go.
 
 ## AMD TDP Control
-Adjustor controls TDP through the Dynamic Power and Thermal Configuration Interface, 
-which exposes a superset of the parameters that can be found in 
+Adjustor controls TDP through the Dynamic Power and Thermal Configuration Interface
+of AMD, which exposes a superset of the parameters that can be currently found in 
 [RyzenAdj](https://github.dev/FlyGoat/RyzenAdj/), through ACPI.
-This vendor function is part of the ACPI ASL library, and provided through the
+This vendor interface is part of the ACPI ASL library, and provided through the
 ALIB method 0x0C.
+The underlying implementation of the interface is SMU calls.
 This means that as long as the kernel module `acpi_call` is loaded, Adjustor
 can control TDP in an equivalent way to [RyzenAdj](https://github.dev/FlyGoat/RyzenAdj/).
 
-ALIB does not provide a way for reading the performance metrics table, so 
-Adjustor can only write TDP values.
+Right now, Adjustor only implements a subset of useful ALIB parameters that are
+well documented.
+In addition, ALIB does not provide a way for reading the performance metrics table, 
+so Adjustor can only write (not read) TDP values.
 From reverse engineering the Legion Go (see [here](./alib.md)), and seeing how it
 interacts with ALIB, it was found that there are at least 10 parameters which control
 the method STTv2 and are not part of RyzenAdj or have been documented elsewhere.
 
 ## Installation
-Installation instructions coming the following days.
+Adjustor is available on [AUR](https://aur.archlinux.org/packages/adjustor)
+and provided Handheld Daemon has been installed through 
+[AUR](https://aur.archlinux.org/packages/hhd) too, it will load it automatically
+on restart.
+COPR coming soon.
+
+Alternatively, on a local install of Handheld Daemon you may:
+```bash
+~/.local/share/hhd/venv/bin/pip install --upgrade adjustor
+```
+However, the autoupdater in Handheld Daemon does not support updating yet.
 
 ## Development
 Install to the same virtual environment as hhd to have Adjustor picked up