Apply XPS 13 Panther Lake display parameters
Disable PSR2 selective fetch and Panel Replay on DX13260 Panther Lake through a Limine drop-in. Apply it during hardware setup and an update migration, rebuild once per machine, and request reboot until both parameters are booted. Reject diagnosed Limine build errors even when the wrapper returns success so interrupted repairs stay pending. Co-Authored-By: GPT-6.1-Sol XHigh <noreply@openai.com>
This commit is contained in:
Spencer BullandGPT-6.1-Sol XHigh committed
1 parent
96af8d4c02
commit
8f7dd71fda
4 files changed
+165
No files matched your search
@@ -19,6 +19,7 @@ run_logged "$OMARCHY_INSTALL/hardware/intel/fred.sh"
|
||||
run_logged "$OMARCHY_INSTALL/hardware/intel/fix-wifi7-eht.sh"
|
||||
run_logged "$OMARCHY_INSTALL/hardware/intel/sof-firmware.sh"
|
||||
run_logged "$OMARCHY_INSTALL/hardware/dell-xps13-ptl-speaker-firmware.sh"
|
||||
run_logged "$OMARCHY_INSTALL/hardware/dell-xps13-ptl-display.sh"
|
||||
|
||||
run_logged "$OMARCHY_INSTALL/hardware/fix-elgato-camlink-4k.sh"
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
if omarchy-hw-dell-xps13-dx13260-ptl; then
|
||||
display_conf="/etc/limine-entry-tool.d/dell-xps13-ptl-display.conf"
|
||||
display_cmdline='KERNEL_CMDLINE[default]+=" xe.enable_psr2_sel_fetch=0 xe.enable_panel_replay=0"'
|
||||
|
||||
if [[ ! -f $display_conf ]] || ! grep -Fxq "$display_cmdline" "$display_conf"; then
|
||||
sudo mkdir -p /etc/limine-entry-tool.d
|
||||
printf '%s\n' '# Dell XPS 13 Panther Lake display workaround' "$display_cmdline" |
|
||||
sudo tee "$display_conf" >/dev/null
|
||||
fi
|
||||
fi
|
||||
@@ -0,0 +1,27 @@
|
||||
echo "Apply the Dell XPS 13 Panther Lake display workaround"
|
||||
|
||||
if omarchy-hw-dell-xps13-dx13260-ptl; then
|
||||
source "$OMARCHY_PATH/install/hardware/dell-xps13-ptl-display.sh"
|
||||
|
||||
display_rebuild_marker="/var/lib/omarchy/migrations/1790916392"
|
||||
|
||||
# Record a successful machine-wide rebuild so other users do not repeat it.
|
||||
if [[ ! -e $display_rebuild_marker ]]; then
|
||||
if ! display_rebuild_output=$(sudo limine-mkinitcpio 2>&1); then
|
||||
printf '%s\n' "$display_rebuild_output" >&2
|
||||
exit 1
|
||||
fi
|
||||
printf '%s\n' "$display_rebuild_output"
|
||||
|
||||
# Limine reports per-kernel build errors on stderr but can still exit zero.
|
||||
if [[ $display_rebuild_output == *"ERROR:"* ]]; then
|
||||
exit 1
|
||||
fi
|
||||
sudo install -Dm644 /dev/null "$display_rebuild_marker"
|
||||
fi
|
||||
|
||||
if ! grep -Eq '(^| )xe.enable_psr2_sel_fetch=0( |$)' /proc/cmdline ||
|
||||
! grep -Eq '(^| )xe.enable_panel_replay=0( |$)' /proc/cmdline; then
|
||||
omarchy-state set reboot-required
|
||||
fi
|
||||
fi
|
||||
Executable
+127
@@ -0,0 +1,127 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
||||
|
||||
leaf="$ROOT/install/hardware/dell-xps13-ptl-display.sh"
|
||||
migration="$ROOT/migrations/1790916392.sh"
|
||||
|
||||
grep -Fq 'run_logged "$OMARCHY_INSTALL/hardware/dell-xps13-ptl-display.sh"' "$ROOT/install/hardware/all.sh" ||
|
||||
fail "hardware setup applies the XPS 13 Panther Lake display workaround"
|
||||
pass "hardware setup applies the XPS 13 Panther Lake display workaround"
|
||||
|
||||
test_tmp=$(mktemp -d)
|
||||
trap 'rm -rf "$test_tmp"' EXIT
|
||||
export OMARCHY_PATH="$test_tmp/omarchy"
|
||||
mkdir -p "$test_tmp/bin" "$OMARCHY_PATH/install/hardware"
|
||||
|
||||
# Redirect fixed production paths only in temporary source copies.
|
||||
redirect_path() {
|
||||
local literal replacement
|
||||
printf -v literal '%q' "$2"
|
||||
replacement=$(printf '%s' "$literal" | sed 's/[\\&|]/\\&/g')
|
||||
sed "s|$1|$replacement|g"
|
||||
}
|
||||
|
||||
display_conf="$test_tmp/limine/dell-xps13-ptl-display.conf"
|
||||
rebuild_marker="$test_tmp/rebuilt"
|
||||
running_cmdline="$test_tmp/cmdline"
|
||||
redirect_path '"/etc/limine-entry-tool.d/dell-xps13-ptl-display.conf"' "$display_conf" <"$leaf" |
|
||||
redirect_path '/etc/limine-entry-tool.d$' "$test_tmp/limine" >"$OMARCHY_PATH/install/hardware/${leaf##*/}"
|
||||
redirect_path '"/var/lib/omarchy/migrations/1790916392"' "$rebuild_marker" <"$migration" |
|
||||
redirect_path '/proc/cmdline' "$running_cmdline" >"$test_tmp/migration.sh"
|
||||
|
||||
cat >"$test_tmp/bin/omarchy-hw-match" <<'SH'
|
||||
#!/bin/bash
|
||||
[[ $TEST_MODEL == *"$1"* ]]
|
||||
SH
|
||||
cat >"$test_tmp/bin/omarchy-hw-intel-ptl" <<'SH'
|
||||
#!/bin/bash
|
||||
[[ $TEST_PTL == "1" ]]
|
||||
SH
|
||||
cat >"$test_tmp/bin/sudo" <<'SH'
|
||||
#!/bin/bash
|
||||
printf 'sudo %s\n' "$*" >>"$TEST_LOG"
|
||||
exec "$@"
|
||||
SH
|
||||
cat >"$test_tmp/bin/limine-mkinitcpio" <<'SH'
|
||||
#!/bin/bash
|
||||
if [[ ${TEST_REBUILD_ERROR:-0} == "1" ]]; then
|
||||
printf '\033[31mERROR: mkinitcpio failed for kernel fixture, skipping.\033[0m\n' >&2
|
||||
exit 0
|
||||
fi
|
||||
declare -A KERNEL_CMDLINE=([default]="root=UUID=keep quiet")
|
||||
source "$TEST_DISPLAY_CONF"
|
||||
printf '%s\n' "${KERNEL_CMDLINE[default]}" >"$TEST_IMAGE_CMDLINE"
|
||||
exit "${TEST_REBUILD_STATUS:-0}"
|
||||
SH
|
||||
cat >"$test_tmp/bin/omarchy-state" <<'SH'
|
||||
#!/bin/bash
|
||||
printf 'state %s\n' "$*" >>"$TEST_LOG"
|
||||
SH
|
||||
chmod +x "$test_tmp/bin/"*
|
||||
export PATH="$test_tmp/bin:$ROOT/bin:$PATH"
|
||||
export TEST_LOG="$test_tmp/calls" TEST_MODEL="XPS 13 DX13260" TEST_PTL=1
|
||||
export TEST_DISPLAY_CONF="$display_conf" TEST_IMAGE_CMDLINE="$test_tmp/image-cmdline"
|
||||
printf '%s\n' 'root=UUID=keep quiet' >"$running_cmdline"
|
||||
|
||||
run_leaf() {
|
||||
: >"$TEST_LOG"
|
||||
bash -euo pipefail -c 'source "$1"' bash "$OMARCHY_PATH/install/hardware/${leaf##*/}"
|
||||
}
|
||||
run_migration() {
|
||||
: >"$TEST_LOG"
|
||||
bash -euo pipefail "$test_tmp/migration.sh" >/dev/null
|
||||
}
|
||||
|
||||
TEST_MODEL="XPS 13 9340" run_leaf
|
||||
[[ ! -e $display_conf && ! -s $TEST_LOG ]] || fail "other XPS models are unchanged"
|
||||
TEST_PTL=0 run_leaf
|
||||
[[ ! -e $display_conf && ! -s $TEST_LOG ]] || fail "DX13260 without Panther Lake is unchanged"
|
||||
TEST_MODEL="ThinkPad X1" run_migration
|
||||
[[ ! -e $display_conf && ! -e $rebuild_marker && ! -s $TEST_LOG ]] || fail "migration skips unrelated hardware"
|
||||
pass "hardware setup and migration skip unrelated models and GPUs"
|
||||
|
||||
run_leaf
|
||||
declare -A KERNEL_CMDLINE=([default]="root=UUID=keep quiet")
|
||||
source "$display_conf"
|
||||
expected_cmdline='root=UUID=keep quiet xe.enable_psr2_sel_fetch=0 xe.enable_panel_replay=0'
|
||||
[[ ${KERNEL_CMDLINE[default]} == "$expected_cmdline" ]] || fail "drop-in adds both parameters and preserves the root command line"
|
||||
pass "drop-in adds both parameters and preserves the root command line"
|
||||
|
||||
run_leaf
|
||||
[[ ! -s $TEST_LOG ]] || fail "repeated hardware setup does not rewrite or duplicate parameters"
|
||||
pass "repeated hardware setup does not rewrite or duplicate parameters"
|
||||
|
||||
TEST_REBUILD_STATUS=1 run_migration && fail "a failed boot rebuild leaves the migration pending"
|
||||
[[ ! -e $rebuild_marker ]] && ! grep -q '^state ' "$TEST_LOG" ||
|
||||
fail "a failed boot rebuild creates no completion marker or reboot state"
|
||||
pass "a failed boot rebuild leaves the migration pending without recording completion"
|
||||
|
||||
printf '%s\n' 'root=UUID=keep quiet' >"$TEST_IMAGE_CMDLINE"
|
||||
TEST_REBUILD_ERROR=1 run_migration && fail "Limine's swallowed build error leaves the migration pending"
|
||||
[[ ! -e $rebuild_marker && $(<"$TEST_IMAGE_CMDLINE") == 'root=UUID=keep quiet' ]] &&
|
||||
! grep -q '^state ' "$TEST_LOG" || fail "a skipped boot image cannot record migration completion"
|
||||
pass "Limine's swallowed build error leaves the migration pending with its old image"
|
||||
|
||||
run_migration
|
||||
[[ -e $rebuild_marker && $(<"$TEST_IMAGE_CMDLINE") == "$expected_cmdline" ]] ||
|
||||
fail "retry rebuilds the boot image with both parameters before recording completion"
|
||||
grep -q '^state set reboot-required$' "$TEST_LOG" || fail "the migration requests a reboot"
|
||||
pass "retry rebuilds the boot image with both parameters and requests a reboot"
|
||||
|
||||
run_migration
|
||||
[[ $(<"$TEST_LOG") == 'state set reboot-required' ]] ||
|
||||
fail "another user's migration skips the machine-wide rebuild and still requests reboot"
|
||||
pass "another user's migration skips the machine-wide rebuild and still requests reboot"
|
||||
|
||||
printf '%s\n' 'root=UUID=keep quiet xe.enable_psr2_sel_fetch=0' >"$running_cmdline"
|
||||
run_migration
|
||||
[[ $(<"$TEST_LOG") == 'state set reboot-required' ]] || fail "one booted parameter is insufficient"
|
||||
printf '%s\n' 'root=UUID=keep quiet xe.enable_panel_replay=0' >"$running_cmdline"
|
||||
run_migration
|
||||
[[ $(<"$TEST_LOG") == 'state set reboot-required' ]] || fail "the other booted parameter is insufficient"
|
||||
printf '%s\n' "$expected_cmdline" >"$running_cmdline"
|
||||
run_migration
|
||||
[[ ! -s $TEST_LOG ]] || fail "both booted parameters avoid an unnecessary reboot prompt"
|
||||
pass "the reboot prompt remains until both parameters are booted"
|
||||
Reference in new issue
Block a user