diff options
| author | Christopher Warner <cwarner@kernelcode.com> | 2026-10-13 15:08:48 -0400 |
|---|---|---|
| committer | Christopher Warner <cwarner@kernelcode.com> | 2026-10-13 15:08:48 -0400 |
| commit | 32b692b7712cc6dcb7e17701c55abb4c3a664964 (patch) | |
| tree | a632d31f0525061e655e744529512cb7b72b5c38 /aerial_screensaver.py | |
| parent | 6f3426c481f03f5beeed9171b3280f0070798844 (diff) | |
| download | aerial-screensaver-linux-32b692b7712cc6dcb7e17701c55abb4c3a664964.tar.gz aerial-screensaver-linux-32b692b7712cc6dcb7e17701c55abb4c3a664964.tar.bz2 aerial-screensaver-linux-32b692b7712cc6dcb7e17701c55abb4c3a664964.tar.xz aerial-screensaver-linux-32b692b7712cc6dcb7e17701c55abb4c3a664964.zip | |
fix: prefer iGPU render node for VAAPI on hybrid AMD
Score PCI Display-class (0x038000) devices above VGA dGPUs so install and encode do not wake the discrete GPU on Framework-style laptops.
Co-authored-by: Cursor <cursoragent@cursor.com>
Diffstat (limited to 'aerial_screensaver.py')
| -rwxr-xr-x | aerial_screensaver.py | 48 |
1 files changed, 37 insertions, 11 deletions
diff --git a/aerial_screensaver.py b/aerial_screensaver.py index 5275dad..4bc27c7 100755 --- a/aerial_screensaver.py +++ b/aerial_screensaver.py @@ -42,23 +42,49 @@ def _load_config() -> dict[str, str]: return cfg +def _pci_class_for_render(render: Path) -> str | None: + """Return PCI class hex for a render node, e.g. '0x038000'.""" + try: + device = Path("/sys/class/drm") / render.name / "device" + class_file = device / "class" + if class_file.is_file(): + return class_file.read_text(encoding="utf-8").strip() + except OSError: + return None + return None + + def find_vaapi_device(preferred: str | None = None) -> str | None: - """Pick a DRM render node for VAAPI. Prefer an explicit path when set.""" + """Pick a DRM render node for VAAPI. Prefer iGPU when hybrid AMD/Intel.""" if preferred and Path(preferred).exists(): return preferred + + renders: list[Path] = [] by_path = Path("/dev/dri/by-path") if by_path.is_dir(): - # Prefer integrated / non-USB render nodes; stable by-path names. - candidates = sorted(by_path.glob("*-render")) - for path in candidates: - name = path.name.lower() - if "usb" in name: + for path in sorted(by_path.glob("*-render")): + if "usb" in path.name.lower(): continue - return str(path) - if candidates: - return str(candidates[0]) - renders = sorted(Path("/dev/dri").glob("renderD*")) - return str(renders[0]) if renders else None + renders.append(path.resolve() if path.exists() else path) + if not renders: + renders = sorted(Path("/dev/dri").glob("renderD*")) + if not renders: + return None + + # Prefer PCI Display controller (0x038000) over VGA (0x030000) — iGPU on + # AMD Framework / Strix hybrids. Fall back to first non-USB node. + scored: list[tuple[int, str]] = [] + for node in renders: + cls = _pci_class_for_render(node) or "" + if cls.startswith("0x038"): + score = 0 + elif cls.startswith("0x030"): + score = 2 + else: + score = 1 + scored.append((score, str(node))) + scored.sort() + return scored[0][1] def setup_logging() -> None: |
