Merge branch 'master' into config-update

AdnanHodzic · Apr 18, 2024 · e540121 · e540121
2 parents bc99a28 + 5e17ee3
commit e540121
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 22 deletions.
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
@@ -258,13 +258,20 @@ def turbo(value: bool = None):
     """
     p_state = Path("/sys/devices/system/cpu/intel_pstate/no_turbo")
     cpufreq = Path("/sys/devices/system/cpu/cpufreq/boost")
+    amd_pstate = Path("/sys/devices/system/cpu/amd_pstate/status")
 
     if p_state.exists():
         inverse = True
         f = p_state
     elif cpufreq.exists():
         f = cpufreq
         inverse = False
+    elif amd_pstate.exists():
+        amd_value = amd_pstate.read_text().strip()
+        if amd_value == "active":
+            print("CPU turbo is controlled by amd-pstate-epp driver")
+        # Basically, no other value should exist.
+        return False
     else:
         print("Warning: CPU turbo is not available")
         return False

diff --git a/nix/default.nix b/nix/default.nix
@@ -2,7 +2,18 @@
   lib,
   python310Packages,
   pkgs,
+  fetchFromGitHub,
 }:
+let
+  psutilGit = python310Packages.psutil.overrideAttrs (oldAttrs: {
+    src = fetchFromGitHub {
+      owner = "giampaolo";
+      repo = "psutil";
+      rev = "4cf56e08c1bc883ec89758834b50954380759858";
+      sha256 = "61JwXP/cZrXqdBnb2J0kdDJoKpltO62KcpM0sYX6g1A=";
+    };
+  });
+in
 python310Packages.buildPythonPackage {
   # use pyproject.toml instead of setup.py
   format = "pyproject";
@@ -15,7 +26,7 @@ python310Packages.buildPythonPackage {
 
   buildInputs = with pkgs; [gtk3 python310Packages.poetry-core];
 
-  propagatedBuildInputs = with python310Packages; [requests pygobject3 click distro psutil setuptools poetry-dynamic-versioning pyinotify];
+  propagatedBuildInputs = with python310Packages; [requests pygobject3 click distro psutilGit setuptools poetry-dynamic-versioning pyinotify];
 
   doCheck = false;
   pythonImportsCheck = ["auto_cpufreq"];

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-psutil = "^5.9.5"
+psutil = {git = "https://github.com/giampaolo/psutil.git", rev = "4cf56e08c1bc883ec89758834b50954380759858"}
 click = "^8.1.0"
 distro = "^1.8.0"
 requests = "^2.31.0"