adjustor 3.1.4__tar.gz → 3.2.0__tar.gz

{adjustor-3.1.4/src/adjustor.egg-info → adjustor-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.1.4
+Version: 3.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

{adjustor-3.1.4 → adjustor-3.2.0}/pyproject.toml

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

{adjustor-3.1.4 → adjustor-3.2.0}/src/adjustor/drivers/amd/__init__.py

@@ -151,7 +151,9 @@ class AmdGPUPlugin(HHDPlugin):
         else:
             if not self.logged_boost:
                 logger.warning(f"CPU Boost toggling is not supported.")
-            del sets["enabled"]["children"]["mode"]["manual"]["children"]["cpu_boost"]
+            del sets["enabled"]["children"]["mode"]["modes"]["manual"]["children"][
+                "cpu_boost"
+            ]
 
         self.supports_nonlinear = can_use_nonlinear()
         if not self.supports_nonlinear:
@@ -241,30 +243,30 @@ class AmdGPUPlugin(HHDPlugin):
                     match self.target:
                         case "balanced":
                             set_gpu_auto()
-                            if self.supports_boost:
-                                set_cpu_boost(True)
                             if self.supports_epp:
                                 set_powersave_governor()
                                 set_epp_mode("balance_power")
+                            if self.supports_boost:
+                                set_cpu_boost(True)
                             set_frequency_scaling(nonlinear=False)
                         case "performance":
                             set_gpu_auto()
-                            if self.supports_boost:
-                                set_cpu_boost(True)
                             if self.supports_epp:
                                 set_powersave_governor()
                                 set_epp_mode("balance_power")
+                            if self.supports_boost:
+                                set_cpu_boost(True)
                             set_frequency_scaling(nonlinear=True)
                         case _:  # power
                             set_gpu_auto()
-                            if self.supports_boost:
-                                set_cpu_boost(False)
                             if self.supports_epp:
                                 set_powersave_governor()
                                 set_epp_mode("power")
-                            set_frequency_scaling(False)
+                            if self.supports_boost:
+                                set_cpu_boost(False)
+                            set_frequency_scaling(nonlinear=False)
                 except Exception as e:
-                    logger.error(f"Failed to set mode:\n{e}")
+                    logger.error(f"Failed to set energy mode:\n{e}")
 
             self.old_gpu = None
             self.old_freq = None
@@ -295,6 +297,15 @@ class AmdGPUPlugin(HHDPlugin):
                     self.old_boost = new_boost
                     try:
                         set_cpu_boost(new_boost == "enabled")
+                        # Set frequency scaling again, as max frequency
+                        # changes depending on whether boost is supported
+                        if self.supports_nonlinear:
+                            set_frequency_scaling(
+                                nonlinear=conf[
+                                    "tdp.amd_energy.mode.manual.cpu_min_freq"
+                                ].to(str)
+                                == "nonlinear"
+                            )
                     except Exception as e:
                         logger.error(f"Failed to set CPU boost:\n{e}")
 
@@ -310,7 +321,7 @@ class AmdGPUPlugin(HHDPlugin):
                         logger.error(f"Failed to set EPP mode:\n{e}")
 
             if self.supports_nonlinear:
-                new_min_freq = conf["tdp.amd_energy.mode.manual.cpu_min_freq"].to(int)
+                new_min_freq = conf["tdp.amd_energy.mode.manual.cpu_min_freq"].to(str)
                 if new_min_freq != self.old_min_freq:
                     self.old_min_freq = new_min_freq
                     try:

{adjustor-3.1.4 → adjustor-3.2.0}/src/adjustor/drivers/asus/__init__.py

@@ -256,9 +256,13 @@ class AsusDriverPlugin(HHDPlugin):
             if boost:
                 # TODO: Use different boost values depending on whether plugged in
                 time.sleep(TDP_DELAY)
-                set_tdp("fast", FTDP_FN, min(MAX_TDP, int(steady * 35 / 25)))
+                set_tdp(
+                    "fast", FTDP_FN, min(max(steady, MAX_TDP), int(steady * 35 / 25))
+                )
                 time.sleep(TDP_DELAY)
-                set_tdp("slow", STDP_FN, min(MAX_TDP, int(steady * 30 / 25)))
+                set_tdp(
+                    "slow", STDP_FN, min(max(steady, MAX_TDP), int(steady * 30 / 25))
+                )
                 time.sleep(TDP_DELAY)
                 set_tdp("steady", CTDP_FN, steady)
             else:

{adjustor-3.1.4 → adjustor-3.2.0}/src/adjustor/fuse/gpu.py

@@ -150,9 +150,13 @@ def set_per_cpu(fn: str, value: str):
 def set_cpu_boost(enable: bool):
     logger.info(f"{'Enabling' if enable else 'Disabling'} CPU boost.")
     if os.path.exists(CPU_BOOST_PATH):
-        with open(CPU_BOOST_PATH, "w") as f:
-            f.write("1" if enable else "0")
-    elif os.path.exists(os.path.join(CPU_PATH, CPU_PREFIX + "0", BOOST_FN)):
+        try:
+            with open(CPU_BOOST_PATH, "w") as f:
+                f.write("1" if enable else "0")
+        except Exception:
+            with open(CPU_BOOST_PATH, "w") as f:
+                f.write("enabled" if enable else "disabled")
+    elif is_in_cpu0(BOOST_FN):
         set_per_cpu(BOOST_FN, "1" if enable else "0")
 
 

{adjustor-3.1.4 → adjustor-3.2.0}/src/adjustor/hhd.py

@@ -261,7 +261,11 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
         drivers_matched = True
         use_acpi_call = True
 
-    if "ROG Ally RC71L" in prod or bool(os.environ.get("HHD_ADJ_DEBUG")):
+    if (
+        "ROG Ally RC71L" in prod
+        or "ROG Ally X RC72L" in prod
+        or bool(os.environ.get("HHD_ADJ_DEBUG"))
+    ):
         drivers.append(AsusDriverPlugin())
         drivers_matched = True
 

{adjustor-3.1.4 → adjustor-3.2.0/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.1.4
+Version: 3.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