diff --git a/packages/omamobile-device-tegu/bin/omamobile-tegu-graphics-start b/packages/omamobile-device-tegu/bin/omamobile-tegu-graphics-start index 7d13670cd..02aa39698 100755 --- a/packages/omamobile-device-tegu/bin/omamobile-tegu-graphics-start +++ b/packages/omamobile-device-tegu/bin/omamobile-tegu-graphics-start @@ -74,6 +74,33 @@ panel_name() { echo "" } +# The panel's backlight is registered when gs_dsim_cmd binds the panel, +# before this start allows DSI commands, and udev starts +# systemd-backlight@ for it right then: its restore of the saved brightness +# gets EPERM, fails and hits the start limit (#512). Once allow_tx is on, +# a restore that failed is run again (after waiting out one still running). +# Only a failed one: a restore that worked, or that udev hasn't started +# yet, is left alone. +restore_backlight() { + local b unit state i + for b in "$root"/sys/class/backlight/*; do + [[ -e $b ]] || continue + unit="systemd-backlight@backlight:${b##*/}.service" + for ((i = 0; i < 20; i++)); do + state=$(systemctl show -P ActiveState "$unit" 2>/dev/null) || state= + [[ $state == activating ]] || break + sleep 0.25 + done + [[ $state == failed ]] || continue + systemctl reset-failed "$unit" 2>/dev/null + if systemctl start "$unit" 2>/dev/null; then + log "${b##*/}: the saved brightness, refused before DSI commands were allowed, is restored" + else + log "${b##*/}: restoring the saved brightness failed again (systemctl status $unit)" + fi + done +} + case ${1:-} in '') ;; --retry) rm -f "$marker" ;; @@ -131,9 +158,11 @@ if [[ -e $decon ]]; then # when it already is) makes the parameter file exist before the write. modprobe gs_dsim_cmd 2>/dev/null || true panel=$(panel_name) + dsi_allowed=0 # the bootloader appends the panel's id (google-tg4c.2d008004 on the palmtop) if [[ $panel == google-tg4c || $panel == google-tg4c.* ]]; then if echo 1 > "$allow_tx" 2>/dev/null; then + dsi_allowed=1 log "panel $panel: DSI commands allowed (gs_dsim_cmd.allow_tx=1)" else log "panel $panel: could not write $allow_tx; the display stays read-only at 60 Hz" @@ -154,6 +183,8 @@ if [[ -e $decon ]]; then [[ -n $card ]] && printf '%s\n' "${card#"$root"}" > "$root/run/omamobile-tegu-display-card" up+="${up:+, }display" fi + # (Not read back from allow_tx: the kernel shows the bool as Y, not 1.) + (( dsi_allowed )) && restore_backlight else log "no display controller in this DTB; skipped" fi diff --git a/packages/omamobile-device-tegu/test/graphics-start b/packages/omamobile-device-tegu/test/graphics-start index 7bd7b74f0..a6e29e005 100755 --- a/packages/omamobile-device-tegu/test/graphics-start +++ b/packages/omamobile-device-tegu/test/graphics-start @@ -50,13 +50,25 @@ case $1 in esac echo "$*" >> "$TEST_LOG" EOF +# systemctl: never the real one. ActiveState is BACKLIGHT_STATE (the +# restore's state as the start finds it), a start fails with +# BACKLIGHT_START_FAILS; every call is logged to its own file. +export TEST_SYSTEMCTL=$tmp/systemctl +cat > "$tmp/bin/systemctl" <<'EOF' +#!/bin/bash +echo "$*" >> "$TEST_SYSTEMCTL" +case $1 in + show) echo "${BACKLIGHT_STATE:-inactive}" ;; + start) [[ -z ${BACKLIGHT_START_FAILS:-} ]] ;; +esac +EOF printf '#!/bin/bash\necho synced >> "$TEST_LOG"\n' > "$tmp/bin/sync" printf '#!/bin/bash\nexit 0\n' > "$tmp/bin/sleep" chmod +x "$tmp/bin/"* # The command line the bootloader built, with its panel name cmdline() { mkdir -p "$OMAMOBILE_TEGU_ROOT/proc"; echo "console=null panic=10 ${1:+exynos_drm.panel_name=$1 }mem_sleep_default=s2idle" > "$OMAMOBILE_TEGU_ROOT/proc/cmdline"; } reset() { - : > "$TEST_LOG" + : > "$TEST_LOG"; : > "$TEST_SYSTEMCTL" rm -rf "$marker" "$devices/1f000000.gpu/driver" "$devices/19470000.display-controller/driver" \ "$OMAMOBILE_TEGU_ROOT/sys/class" "$OMAMOBILE_TEGU_ROOT/sys/module" "$OMAMOBILE_TEGU_ROOT/run" cmdline google-tg4c @@ -212,4 +224,34 @@ reset; rm -rf "$OMAMOBILE_TEGU_ROOT/sys/bus/pci"; out=$(FAIL_MODULE=phy_zuma_pci [[ $out == *"phy_zuma_pcie failed"* && $(loads) != *pcie_gs201* && ! -e $marker ]] || fail "a failed PHY load skips the host: $out" rm -rf "$dt/soc/pcie@13120000" rm -rf "$devices/13120000.pcie" "$dt/reserved-memory" "$OMAMOBILE_TEGU_ROOT/usr/lib/firmware" "$OMAMOBILE_TEGU_ROOT/sys/bus/pci" -echo 'ok - graphics-start: marker first, order kept, failures skipped and named, allow_tx for google-tg4c only, --retry works' + +# The panel's backlight restore (#512): udev ran systemd-backlight@ before +# allow_tx and it failed; after allow_tx it is reset and started again +bl=$OMAMOBILE_TEGU_ROOT/sys/class/backlight/19440000.dsi.0 +unit='systemd-backlight@backlight:19440000.dsi.0.service' +reset; mkdir -p "$bl" +out=$(BACKLIGHT_STATE=failed "$script") +grep -qx "reset-failed $unit" "$TEST_SYSTEMCTL" && grep -qx "start $unit" "$TEST_SYSTEMCTL" \ + || fail "a failed restore was not run again: $(cat "$TEST_SYSTEMCTL")" +[[ $(grep -n '^reset-failed' "$TEST_SYSTEMCTL" | cut -d: -f1) -lt $(grep -n '^start' "$TEST_SYSTEMCTL" | cut -d: -f1) ]] \ + || fail "start before reset-failed (the start limit would refuse it)" +[[ $out == *"19440000.dsi.0: the saved brightness"*"is restored"* ]] || fail "the restore is not logged: $out" +[[ $(loads) == "$all" && ! -e $marker ]] || fail "the restore changed the start: $(loads)" +# a restore that worked, or one udev hasn't started yet, is left alone +for st in active inactive; do + reset; mkdir -p "$bl" + BACKLIGHT_STATE=$st "$script" >/dev/null + ! grep -qE '^(start|reset-failed)' "$TEST_SYSTEMCTL" || fail "a $st restore was started again" +done +# another panel: allow_tx stays off, so a write would still be refused +reset; cmdline google-xyz9; mkdir -p "$bl" +BACKLIGHT_STATE=failed "$script" >/dev/null +! grep -qE '^(start|reset-failed)' "$TEST_SYSTEMCTL" || fail "the restore ran without allow_tx" +# a second failure is logged and is not one of the start's failures +reset; mkdir -p "$bl" +out=$(BACKLIGHT_STATE=failed BACKLIGHT_START_FAILS=1 "$script") || fail "a failed restore failed the start" +[[ $out == *"restoring the saved brightness failed again"* ]] || fail "the second failure is not logged: $out" +# no backlight at all: systemctl is not asked +reset; "$script" >/dev/null +[[ ! -s $TEST_SYSTEMCTL ]] || fail "systemctl was called without a backlight: $(cat "$TEST_SYSTEMCTL")" +echo 'ok - graphics-start: marker first, order kept, failures skipped and named, allow_tx for google-tg4c only, --retry works, a refused backlight restore runs again' diff --git a/packages/omamobile-device-tegu/version b/packages/omamobile-device-tegu/version index 13dead7eb..769ed6ae7 100644 --- a/packages/omamobile-device-tegu/version +++ b/packages/omamobile-device-tegu/version @@ -1 +1 @@ -0.2.10 +0.2.14