summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Warner <cwarner@kernelcode.com>2026-10-13 15:08:48 -0400
committerChristopher Warner <cwarner@kernelcode.com>2026-10-13 15:08:48 -0400
commit32b692b7712cc6dcb7e17701c55abb4c3a664964 (patch)
treea632d31f0525061e655e744529512cb7b72b5c38
parent6f3426c481f03f5beeed9171b3280f0070798844 (diff)
downloadaerial-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>
-rwxr-xr-xaerial_screensaver.py48
-rwxr-xr-xbin/encode-aerial-lite30
-rwxr-xr-xinstall.sh34
3 files changed, 89 insertions, 23 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:
diff --git a/bin/encode-aerial-lite b/bin/encode-aerial-lite
index 58976af..5592568 100755
--- a/bin/encode-aerial-lite
+++ b/bin/encode-aerial-lite
@@ -15,29 +15,45 @@ MAXRATE="${MAXRATE:-2.5M}"
detect_vaapi() {
if [[ -n "${VAAPI_DEVICE:-}" && -e "$VAAPI_DEVICE" ]]; then
- printf '%s\n' "$VAAPI_DEVICE"
+ printf '%s
+' "$VAAPI_DEVICE"
return 0
fi
- if [[ -f "$CONFIG_FILE" ]]; then
+ if [[ -f "${CONFIG_FILE:-}" ]]; then
local from_cfg
from_cfg="$(awk -F= '/^VAAPI_DEVICE=/{print $2; exit}' "$CONFIG_FILE" | tr -d '"' || true)"
if [[ -n "$from_cfg" && -e "$from_cfg" ]]; then
- printf '%s\n' "$from_cfg"
+ printf '%s
+' "$from_cfg"
return 0
fi
fi
- local p
+ # Prefer AMD/Intel iGPU (PCI class 0x038000 Display) over dGPU VGA (0x030000).
+ local best="" best_score=99 p real cls score
if [[ -d /dev/dri/by-path ]]; then
for p in /dev/dri/by-path/*-render; do
[[ -e "$p" ]] || continue
[[ "$(basename "$p")" == *usb* ]] && continue
- printf '%s\n' "$p"
- return 0
+ real="$(readlink -f "$p")"
+ cls="$(cat "/sys/class/drm/$(basename "$real")/device/class" 2>/dev/null || true)"
+ score=1
+ [[ "$cls" == 0x038* ]] && score=0
+ [[ "$cls" == 0x030* ]] && score=2
+ if [[ "$score" -lt "$best_score" ]]; then
+ best="$p"
+ best_score="$score"
+ fi
done
fi
+ if [[ -n "$best" ]]; then
+ printf '%s
+' "$best"
+ return 0
+ fi
for p in /dev/dri/renderD*; do
[[ -e "$p" ]] || continue
- printf '%s\n' "$p"
+ printf '%s
+' "$p"
return 0
done
return 1
diff --git a/install.sh b/install.sh
index 63a1554..85dc8df 100755
--- a/install.sh
+++ b/install.sh
@@ -30,22 +30,46 @@ if [[ "$MISSING" -ne 0 ]]; then
fi
detect_vaapi() {
- local p
if [[ -n "${VAAPI_DEVICE:-}" && -e "$VAAPI_DEVICE" ]]; then
- printf '%s\n' "$VAAPI_DEVICE"
+ printf '%s
+' "$VAAPI_DEVICE"
return 0
fi
+ if [[ -f "${CONFIG_FILE:-}" ]]; then
+ local from_cfg
+ from_cfg="$(awk -F= '/^VAAPI_DEVICE=/{print $2; exit}' "$CONFIG_FILE" | tr -d '"' || true)"
+ if [[ -n "$from_cfg" && -e "$from_cfg" ]]; then
+ printf '%s
+' "$from_cfg"
+ return 0
+ fi
+ fi
+ # Prefer AMD/Intel iGPU (PCI class 0x038000 Display) over dGPU VGA (0x030000).
+ local best="" best_score=99 p real cls score
if [[ -d /dev/dri/by-path ]]; then
for p in /dev/dri/by-path/*-render; do
[[ -e "$p" ]] || continue
[[ "$(basename "$p")" == *usb* ]] && continue
- printf '%s\n' "$p"
- return 0
+ real="$(readlink -f "$p")"
+ cls="$(cat "/sys/class/drm/$(basename "$real")/device/class" 2>/dev/null || true)"
+ score=1
+ [[ "$cls" == 0x038* ]] && score=0
+ [[ "$cls" == 0x030* ]] && score=2
+ if [[ "$score" -lt "$best_score" ]]; then
+ best="$p"
+ best_score="$score"
+ fi
done
fi
+ if [[ -n "$best" ]]; then
+ printf '%s
+' "$best"
+ return 0
+ fi
for p in /dev/dri/renderD*; do
[[ -e "$p" ]] || continue
- printf '%s\n' "$p"
+ printf '%s
+' "$p"
return 0
done
return 1