adjustor 3.4.3__tar.gz → 3.4.5__tar.gz

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

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

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

{adjustor-3.4.3 → adjustor-3.4.5}/src/adjustor/drivers/amd/__init__.py

@@ -24,7 +24,7 @@ from adjustor.fuse.gpu import (
 
 logger = logging.getLogger(__name__)
 
-APPLY_DELAY = 0.2
+APPLY_DELAY = 0.25
 
 
 def _ppd_client(emit, proc):
@@ -69,15 +69,16 @@ class AmdGPUPlugin(HHDPlugin):
         self.initialized = False
         self.supports_boost = False
         self.supports_sched = False
+        self.min_freq = None
         self.avail_scheds = {}
 
         self.proc = None
         self.t = None
 
         self.queue = None
+        self.queue_gpu = None
         self.sched_proc = None
         self.old_ppd = False
-        self.old_gpu = None
         self.old_freq = None
         self.old_sched = "disabled"
         self.old_boost = None
@@ -157,12 +158,29 @@ class AmdGPUPlugin(HHDPlugin):
             }
 
         self.initialized = True
-        freq = sets["enabled"]["children"]["mode"]["modes"]["manual"]["children"][
+        
+        # Initialize frequency settings
+        manual_freq = sets["enabled"]["children"]["mode"]["modes"]["manual"][
+            "children"
+        ]["gpu_freq"]["modes"]["manual"]["children"]["frequency"]
+        upper_freq = sets["enabled"]["children"]["mode"]["modes"]["manual"][
+            "children"
+        ]["gpu_freq"]["modes"]["upper"]["children"]["frequency"]
+        min_freq = sets["enabled"]["children"]["mode"]["modes"]["manual"]["children"][
             "gpu_freq"
-        ]["modes"]["manual"]["children"]["frequency"]
-        freq["min"] = status.freq_min
-        freq["max"] = status.freq_max
-        freq["default"] = ((status.freq_min + status.freq_max) // 200) * 100
+        ]["modes"]["range"]["children"]["min"]
+        max_freq = sets["enabled"]["children"]["mode"]["modes"]["manual"]["children"][
+            "gpu_freq"
+        ]["modes"]["range"]["children"]["max"]
+
+        manual_freq["default"] = ((status.freq_min + status.freq_max) // 200) * 100
+        upper_freq["default"] = status.freq_max
+        min_freq["default"] = status.freq_min
+        max_freq["default"] = status.freq_max
+        for freq in (manual_freq, min_freq, max_freq, upper_freq):
+            freq["min"] = status.freq_min
+            freq["max"] = status.freq_max
+        self.min_freq = status.freq_min
 
         self.supports_boost = status.cpu_boost is not None
         if self.supports_boost:
@@ -196,7 +214,7 @@ class AmdGPUPlugin(HHDPlugin):
 
         self.avail_scheds = {}
         avail_pretty = {}
-        kernel_supports = os.path.isfile("/sys/kernel/sched_ext/state") or True
+        kernel_supports = os.path.isfile("/sys/kernel/sched_ext/state")
         if kernel_supports:
             for sched, pretty in sets["enabled"]["children"]["mode"]["modes"]["manual"][
                 "children"
@@ -273,8 +291,8 @@ class AmdGPUPlugin(HHDPlugin):
             else:
                 self.close_ppd()
 
+        curr = time.perf_counter()
         if conf["tdp.amd_energy.mode.mode"].to(str) == "auto":
-            curr = time.perf_counter()
             if self.target != self.old_target:
                 self.old_target = self.target
                 self.queue = curr + APPLY_DELAY
@@ -316,7 +334,6 @@ class AmdGPUPlugin(HHDPlugin):
             # 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
             self.old_epp = None
@@ -324,16 +341,40 @@ class AmdGPUPlugin(HHDPlugin):
         else:
             self.old_target = None
             new_gpu = conf["tdp.amd_energy.mode.manual.gpu_freq.mode"].to(str)
-            new_freq = conf["tdp.amd_energy.mode.manual.gpu_freq.manual.frequency"].to(
-                int
-            )
-            if new_gpu != self.old_gpu or new_freq != self.old_freq:
-                self.old_gpu = new_gpu
+            match new_gpu:
+                case "manual":
+                    f = conf["tdp.amd_energy.mode.manual.gpu_freq.manual.frequency"].to(
+                        int
+                    )
+                    new_freq = (f, f)
+                case "upper":
+                    f = conf["tdp.amd_energy.mode.manual.gpu_freq.upper.frequency"].to(
+                        int
+                    )
+                    new_freq = (self.min_freq or f, f)
+                case "range":
+                    min_f = conf["tdp.amd_energy.mode.manual.gpu_freq.range.min"].to(
+                        int
+                    )
+                    max_f = conf["tdp.amd_energy.mode.manual.gpu_freq.range.max"].to(
+                        int
+                    )
+                    if max_f < min_f:
+                        max_f = min_f
+                        conf["tdp.amd_energy.mode.manual.gpu_freq.range.max"] = min_f
+                    new_freq = (min_f, max_f)
+                case _:
+                    new_freq = None
+
+            if new_freq != self.old_freq:
                 self.old_freq = new_freq
+                self.queue_gpu = curr + APPLY_DELAY
 
+            if self.queue_gpu is not None and curr >= self.queue_gpu:
+                self.queue_gpu = None
                 try:
-                    if new_gpu == "manual":
-                        set_gpu_manual(new_freq)
+                    if new_freq:
+                        set_gpu_manual(*new_freq)
                     else:
                         set_gpu_auto()
                 except Exception as e:

{adjustor-3.4.3 → adjustor-3.4.5}/src/adjustor/drivers/amd/settings.yml

@@ -26,7 +26,7 @@ enabled:
           children:
             cpu_pref:
               type: multiple
-              title: CPU Power
+              title: CPU Power (EPP)
               tags: [ordinal]
               hint: >-
                 Sets the energy performance preference for the CPU.
@@ -41,7 +41,7 @@ enabled:
             cpu_min_freq:
               type: multiple
               title: CPU Minimum Frequency
-              tags: [ordinal]
+              tags: [ordinal, expert]
               default: min
               options:
                 min: 400MHz
@@ -78,20 +78,41 @@ enabled:
                   title: Auto
                   hint: >-
                     Lets the GPU manage its own frequency.
-                manual:
+                upper:
                   type: container
-                  title: Manual
+                  title: Upper Limit
                   hint: >-
-                    Sets the GPU frequency manually.
+                    Sets the GPU frequency to a maximum.
                   children:
-                    frequency:
-                      title: Frequency
-                      unit: MHz
+                    frequency: &freq
                       type: int
+                      unit: MHz
                       min: 300
                       max: 2000
                       step: 100
                       default: 1000
+                      title: Maximum Frequency
+                range:
+                  type: container
+                  title: Range
+                  hint: >-
+                    Sets the GPU frequency to a range.
+                  children:
+                    min:
+                      <<: *freq
+                      title: Minimum Frequency
+                    max:
+                      <<: *freq
+                      title: Maximum Frequency
+                manual:
+                  type: container
+                  title: Fixed
+                  hint: >-
+                    Sets the GPU frequency manually.
+                  children:
+                    frequency:
+                      <<: *freq
+                      title: Frequency
             sched:
               type: multiple
               title: Custom Scheduler

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

@@ -12,6 +12,7 @@ logger = logging.getLogger(__name__)
 
 APPLY_DELAY = 0.7
 TDP_DELAY = 0.1
+SLEEP_DELAY = 4
 MIN_TDP_START = 7
 MAX_TDP_START = 30
 # FIXME: add AC/DC values
@@ -440,6 +441,9 @@ class AsusDriverPlugin(HHDPlugin):
                         self.new_mode = "balanced"
                     case "performance":
                         self.new_mode = "performance"
+            elif ev['type'] == 'special' and ev.get('event', None) == "wakeup":
+                logger.info(f"Waking up from sleep, resetting TDP after {SLEEP_DELAY} seconds.")
+                self.queue_tdp = time.time() + SLEEP_DELAY
             elif self.cycle_tdp and ev['type'] == "special" and ev['event'] == "xbox_y":
                 match self.mode:
                     case "quiet":

{adjustor-3.4.3 → adjustor-3.4.5}/src/adjustor/drivers/smu/__init__.py

@@ -13,6 +13,7 @@ logger = logging.getLogger(__name__)
 
 PP_DELAY = 0.2
 APPLY_DELAY = 1
+SLEEP_DELAY = 4
 
 
 class SmuQamPlugin(HHDPlugin):
@@ -206,6 +207,10 @@ class SmuQamPlugin(HHDPlugin):
                         self.new_tdp = 15
                     case "performance":
                         self.new_tdp = 25
+            
+            if ev['type'] == 'special' and ev.get('event', None) == "wakeup":
+                logger.info(f"Waking up from sleep, resetting TDP after {SLEEP_DELAY} seconds.")
+                self.queued = time.time() + SLEEP_DELAY
 
     def close(self):
         pass

{adjustor-3.4.3 → adjustor-3.4.5}/src/adjustor/fuse/gpu.py

@@ -112,15 +112,18 @@ def set_gpu_auto():
         f.write("auto")
 
 
-def set_gpu_manual(freq: int):
-    logger.info(f"Pinning GPU frequency to '{freq}Mhz'.")
+def set_gpu_manual(min_freq: int, max_freq: int | None = None):
+    if max_freq is None:
+        max_freq = min_freq
+
+    logger.info(f"Pinning GPU frequency to '{min_freq}Mhz' - '{max_freq}Mhz'.")
     hwmon = find_igpu()
     if not hwmon:
         return None
     with open(os.path.join(hwmon, GPU_LEVEL_PATH), "w") as f:
         f.write("manual")
 
-    for cmd in [f"s 0 {freq}\n", f"s 1 {freq}\n", f"c\n"]:
+    for cmd in [f"s 0 {min_freq}\n", f"s 1 {max_freq}\n", f"c\n"]:
         with open(os.path.join(hwmon, GPU_FREQUENCY_PATH), "w") as f:
             f.write(cmd)
 

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

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