Skip to content

[H700] Fix screen rotation and enable independent HDMI/internal settings #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fedekrum wants to merge 1 commit into
base: knulli-main
Choose a base branch
from
+48 −2
Open

[H700] Fix screen rotation and enable independent HDMI/internal settings #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 48 additions & 2 deletions board/allwinner/h700/fsoverlay/usr/bin/knulli-resolution
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
DISPLAY="/sys/kernel/debug/dispdbg"
HDMI_STATE="/sys/devices/platform/soc/6000000.hdmi/extcon/hdmi/state"
read -r BOARD < "/boot/boot/knulli.board"
LAST_STATE_FILE="/var/run/last_hdmi_state"

f_usage() {
echo "$0 listOutputs" >&2
Expand Down Expand Up @@ -31,6 +32,35 @@ set_fb() {
fbset -g "$want_x" "$want_y" "$want_vx" "$want_vy" "$want_bpp"
}

# Sync the global display.rotate value with per-output keys.
# When the output changes (HDMI plugged/unplugged), restore the rotation
# previously saved for that output. When the output stays the same,
# persist the current UI value to the active output key.
sync_rotation_per_output() {
read -r STATE < "$HDMI_STATE"
[ -f "$LAST_STATE_FILE" ] && LAST_STATE=$(cat "$LAST_STATE_FILE") || LAST_STATE=""
CURRENT_ROT=$(knulli-settings-get display.rotate 2>/dev/null)
[ -z "$CURRENT_ROT" ] && CURRENT_ROT=0

if [ "$STATE" != "$LAST_STATE" ]; then
# Output changed — restore the rotation saved for this output
if [ "$STATE" = "HDMI=1" ]; then
SAVED=$(knulli-settings-get display.rotate.hdmi 2>/dev/null)
else
SAVED=$(knulli-settings-get display.rotate.internal 2>/dev/null)
fi
[ -n "$SAVED" ] && knulli-settings-set display.rotate "$SAVED"
echo "$STATE" > "$LAST_STATE_FILE"
else
# Same output — save current rotation to the active output key
if [ "$STATE" = "HDMI=1" ]; then
knulli-settings-set display.rotate.hdmi "$CURRENT_ROT"
else
knulli-settings-set display.rotate.internal "$CURRENT_ROT"
fi
fi
}

set_output() {
OUTPUT=$1
case "$OUTPUT" in
Expand Down Expand Up @@ -94,6 +124,7 @@ case "${ACTION}" in
"listModes")
;;
"setOutput")
sync_rotation_per_output
read -r STATE < "$HDMI_STATE"
if [ "$STATE" = "HDMI=1" ]; then
set_output hdmi
Expand All @@ -103,12 +134,26 @@ case "${ACTION}" in
;;
"currentResolution")
if [ "$BOARD" = "rg28xx" ]; then
fbset | grep "geometry" | awk '{print $3"x"$2}'
RES=$(fbset | grep "geometry" | awk '{print $3"x"$2}')
else
RES=$(fbset | grep "geometry" | awk '{print $2"x"$3}')
fi
ROTATE=$(knulli-settings-get display.rotate 2>/dev/null)
if [ "$ROTATE" = "1" ] || [ "$ROTATE" = "3" ]; then
W=$(echo "$RES" | cut -dx -f1)
H=$(echo "$RES" | cut -dx -f2)
echo "${H}x${W}"
else
fbset | grep "geometry" | awk '{print $2"x"$3}'
echo "$RES"
fi
;;
"currentOutput")
read -r STATE < "$HDMI_STATE"
if [ "$STATE" = "HDMI=1" ]; then
echo "hdmi"
else
echo "internal"
fi
;;
"currentMode")
;;
Expand All @@ -117,6 +162,7 @@ case "${ACTION}" in
"supportSystemReflection")
;;
"supportSystemRotation")
exit 1
;;
*)
echo "error: invalid command ${ACTION}" >&2
Expand Down