adjustor 3.4.0__tar.gz → 3.4.2__tar.gz

{adjustor-3.4.0/src/adjustor.egg-info → adjustor-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.4.0
+Version: 3.4.2
 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.0 → adjustor-3.4.2}/pyproject.toml

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

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/drivers/amd/__init__.py

@@ -120,7 +120,7 @@ class AmdGPUPlugin(HHDPlugin):
                     "-t",
                     "service",
                     "--full",
-                    "--all",
+                    # "--all",
                     "--plain",
                     "--no-legend",
                 ]
@@ -196,7 +196,7 @@ class AmdGPUPlugin(HHDPlugin):
 
         self.avail_scheds = {}
         avail_pretty = {}
-        kernel_supports = os.path.isfile("/sys/kernel/sched_ext/state")
+        kernel_supports = os.path.isfile("/sys/kernel/sched_ext/state") or True
         if kernel_supports:
             for sched, pretty in sets["enabled"]["children"]["mode"]["modes"]["manual"][
                 "children"
@@ -284,8 +284,6 @@ class AmdGPUPlugin(HHDPlugin):
                 logger.info(
                     f"Handling energy settings for power profile '{self.target}'."
                 )
-                # Unless it is set manually, use the default scheduler.
-                self.close_sched()
                 try:
                     match self.target:
                         case "balanced":
@@ -315,6 +313,9 @@ class AmdGPUPlugin(HHDPlugin):
                 except Exception as e:
                     logger.error(f"Failed to set energy mode:\n{e}")
 
+            # Unless it is set manually, use the default scheduler.
+            self.close_sched()
+            self.old_sched = None
             self.old_gpu = None
             self.old_freq = None
             self.old_boost = None

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/drivers/amd/settings.yml

@@ -115,7 +115,7 @@ conflict:
       type: display
       default: >-
         Energy Management can not be enabled while PPD or TuneD are enabled.
-        `systemctl disable --now power-profile-daemon` or `tuned`.
+        `systemctl mask power-profiles-daemon` or `tuned`.
     enable:
       title: Enable Energy Management
       type: action

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/drivers/asus/__init__.py

@@ -6,6 +6,7 @@ from typing import Sequence
 from hhd.plugins import Config, Context, Event, HHDPlugin, load_relative_yaml
 
 from adjustor.core.platform import set_platform_profile
+from adjustor.i18n import _
 
 logger = logging.getLogger(__name__)
 
@@ -141,6 +142,7 @@ class AsusDriverPlugin(HHDPlugin):
         self.new_mode = None
         self.old_target = None
         self.pp = None
+        self.sys_tdp = False
         self.allyx = allyx
 
     def settings(self):
@@ -252,6 +254,8 @@ class AsusDriverPlugin(HHDPlugin):
 
         tdp_reset = False
         if mode is not None and mode != self.old_conf["tdp_v2.mode"].to(str):
+            if not new_tdp:
+                self.sys_tdp = False
             tdp_reset = True
 
         # Handle EPP for presets
@@ -279,6 +283,9 @@ class AsusDriverPlugin(HHDPlugin):
             steady_updated = steady and steady != self.old_conf["tdp_v2.custom.tdp"].to(
                 int
             )
+            if not new_tdp and steady_updated:
+                self.sys_tdp = False
+
             steady_updated |= tdp_reset
 
             if self.startup and (steady > MAX_TDP_START or steady < MIN_TDP_START):
@@ -407,6 +414,12 @@ class AsusDriverPlugin(HHDPlugin):
                 logger.error(f"Could not set fan curve. Error:\n{e}")
             self.queue_fan = None
 
+        # Show steam message
+        if self.sys_tdp:
+            conf["tdp.asus.sys_tdp"] = _("Steam is controlling TDP")
+        else:
+            conf["tdp.asus.sys_tdp"] = ""
+
         # Save current config
         self.cycle_tdp = conf["tdp.asus.cycle_tdp"].to(bool)
         self.old_conf = conf["tdp.asus"]
@@ -418,6 +431,7 @@ class AsusDriverPlugin(HHDPlugin):
         for ev in events:
             if ev["type"] == "tdp":
                 self.new_tdp = ev["tdp"]
+                self.sys_tdp = ev['tdp'] is not None
             elif ev["type"] == "ppd":
                 match ev["status"]:
                     case "power":

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/drivers/asus/settings.yml

@@ -45,6 +45,11 @@ children:
             hint: >-
               Allows the device to temporarily boost by setting appropriate slow and fast TDPs.
   
+  sys_tdp:
+    type: display
+    title: " "
+    tags: [non-essential]
+
   cycle_tdp:
     type: bool
     title: Change TDP with View+Y

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/drivers/lenovo/__init__.py

@@ -8,22 +8,23 @@ from hhd.plugins.conf import Config
 from adjustor.core.lenovo import (
     MIN_CURVE,
     TdpMode,
+    get_bios_version,
     get_charge_limit,
     get_full_fan_speed,
     get_power_light,
+    get_power_light_v1,
     get_tdp_mode,
     set_charge_limit,
     set_fan_curve,
     set_fast_tdp,
     set_full_fan_speed,
     set_power_light,
+    set_power_light_v1,
     set_slow_tdp,
     set_steady_tdp,
     set_tdp_mode,
-    get_bios_version,
-    get_power_light_v1,
-    set_power_light_v1,
 )
+from adjustor.i18n import _
 
 logger = logging.getLogger(__name__)
 
@@ -41,6 +42,7 @@ class LenovoDriverPlugin(HHDPlugin):
         self.enforce_limits = True
         self.startup = True
         self.old_conf = None
+        self.sys_tdp = False
         self.fan_curve_set = False
 
         bios_version = get_bios_version()
@@ -175,6 +177,8 @@ class LenovoDriverPlugin(HHDPlugin):
         # Grab from power button
         new_mode = get_tdp_mode()
         if new_mode != mode:
+            if not new_tdp:
+                self.sys_tdp = False
             tdp_reset = True
         conf["tdp.lenovo.tdp.mode"] = new_mode
 
@@ -219,6 +223,8 @@ class LenovoDriverPlugin(HHDPlugin):
             steady_updated = steady and steady != self.old_conf["tdp.custom.tdp"].to(
                 int
             )
+            if steady_updated and not new_tdp:
+                self.sys_tdp = False
 
             if self.startup and (steady > 30 or steady < 7):
                 logger.warning(
@@ -311,6 +317,12 @@ class LenovoDriverPlugin(HHDPlugin):
             self.fan_curve_set = True
             self.queue_fan = None
 
+        # Show steam message
+        if self.sys_tdp:
+            conf["tdp.lenovo.cycle_info"] = _("Steam is controlling TDP")
+        else:
+            conf["tdp.lenovo.cycle_info"] = _("Legion L + Y changes TDP Mode")
+
         # Save current config
         self.old_conf = conf["tdp.lenovo"]
 
@@ -321,6 +333,7 @@ class LenovoDriverPlugin(HHDPlugin):
         for ev in events:
             if ev["type"] == "tdp":
                 self.new_tdp = ev["tdp"]
+                self.sys_tdp = ev['tdp'] is not None
             if ev["type"] == "ppd":
                 match ev["status"]:
                     case "power":

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/drivers/lenovo/settings.yml

@@ -49,12 +49,11 @@ children:
             default: True
             hint: >-
               Allows the device to boost by setting appropriate slow and fast TDPs.
-  
+
   cycle_info:
     type: display
     title: " "
     tags: [non-essential]
-    default: "Legion L + Y changes TDP Mode"
 
   ffss:
     type: bool

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/drivers/smu/__init__.py

@@ -1,12 +1,13 @@
 import logging
 import time
+from typing import Sequence
 
-from hhd.plugins import Context, HHDPlugin, load_relative_yaml, Event
+from hhd.plugins import Context, Event, HHDPlugin, load_relative_yaml
 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
+from adjustor.i18n import _
 
 logger = logging.getLogger(__name__)
 
@@ -34,6 +35,7 @@ class SmuQamPlugin(HHDPlugin):
         self.old_conf = None
         self.startup = True
         self.queued = None
+        self.sys_tdp = False
 
         self.old_tdp = None
         self.old_boost = None
@@ -101,15 +103,19 @@ class SmuQamPlugin(HHDPlugin):
             return
 
         curr = time.time()
+        sys_tdp = False
         if self.new_tdp:
             new_tdp = self.new_tdp
             self.new_tdp = None
+            sys_tdp = True
             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
+            smin = self.lims.smin
+            smax = self.lims.smax
+
             if smin and new_tdp < smin:
                 logger.warning(
                     f"Device TDP ({new_tdp}) too low for startup, adjusting."
@@ -129,6 +135,9 @@ class SmuQamPlugin(HHDPlugin):
             and self.old_tdp is not None
             and self.old_boost is not None
         )
+        if changed and not sys_tdp:
+            self.sys_tdp = False
+
         if self.startup or changed:
             self.queued = curr + APPLY_DELAY
             self.is_set = False
@@ -167,6 +176,12 @@ class SmuQamPlugin(HHDPlugin):
                 conf["tdp.smu.std.slow_limit"] = new_tdp
                 conf["tdp.smu.std.fast_limit"] = new_tdp
 
+        # Show steam message
+        if self.sys_tdp:
+            conf["tdp.qam.sys_tdp"] = _("Steam is controlling TDP")
+        else:
+            conf["tdp.qam.sys_tdp"] = ""
+
         if self.startup or (self.queued and self.queued < curr):
             self.startup = False
             self.queued = None
@@ -178,7 +193,10 @@ class SmuQamPlugin(HHDPlugin):
     def notify(self, events: Sequence[Event]):
         for ev in events:
             if ev["type"] == "tdp":
+                self.sys_tdp = True
                 self.new_tdp = ev["tdp"]
+                self.sys_tdp = ev['tdp'] is not None
+
             if ev["type"] == "ppd":
                 # TODO: Make tunable per device
                 match ev["status"]:

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/drivers/smu/qam.yml

@@ -13,4 +13,9 @@ children:
   boost:
     title: TDP Boost
     type: bool
-    default: True
+    default: True
+  
+  sys_tdp:
+    type: display
+    title: " "
+    tags: [non-essential]

{adjustor-3.4.0 → adjustor-3.4.2}/src/adjustor/fuse/utils.py

@@ -127,6 +127,8 @@ def _tdp_client(should_exit: Event, set_tdp, min_tdp, default_tdp, max_tdp):
                         logger.info(
                             "Received TDP value 0 from /sys. Assuming its the default value and ignoring."
                         )
+                        # Send none to remove steam notice
+                        set_tdp(None)
                 except:
                     logger.error(f"Failed process TDP value, received:\n{data}")
                 send_cmd(b"ack\n")

{adjustor-3.4.0 → adjustor-3.4.2/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.4.0
+Version: 3.4.2
 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