mirror of
https://github.com/brain-hackers/brain-config.git
synced 2024-12-22 20:20:06 +09:00
Remove pixel doubling on KMS; not compatible with KMS-based overscan setting
This commit is contained in:
parent
129b9461b3
commit
715b391f1b
34
raspi-config
34
raspi-config
@ -437,11 +437,7 @@ get_pixdub() {
|
|||||||
echo 0
|
echo 0
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if grep -q 'scale 0.5x0.5' /usr/share/dispsetup.sh ; then
|
echo 1
|
||||||
echo 0
|
|
||||||
else
|
|
||||||
echo 1
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -489,29 +485,6 @@ do_pixdub() {
|
|||||||
else
|
else
|
||||||
return $RET
|
return $RET
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
if [ $RET -eq 0 ] ; then
|
|
||||||
if [ -e /usr/share/dispsetup.sh ] ; then
|
|
||||||
rm /usr/share/dispsetup.sh
|
|
||||||
fi
|
|
||||||
echo '#!/bin/sh' > /usr/share/dispsetup.sh
|
|
||||||
DEV=$(xrandr | grep -w connected | cut -f1 -d' ')
|
|
||||||
for item in $DEV
|
|
||||||
do
|
|
||||||
echo xrandr --output $item --scale 0.5x0.5 --filter nearest >> /usr/share/dispsetup.sh
|
|
||||||
done
|
|
||||||
STATUS=enabled
|
|
||||||
elif [ $RET -eq 1 ]; then
|
|
||||||
if [ -e /usr/share/dispsetup.sh ] ; then
|
|
||||||
rm /usr/share/dispsetup.sh
|
|
||||||
fi
|
|
||||||
echo '#!/bin/sh' > /usr/share/dispsetup.sh
|
|
||||||
echo 'exit 0' >> /usr/share/dispsetup.sh
|
|
||||||
STATUS=disabled
|
|
||||||
else
|
|
||||||
return $RET
|
|
||||||
fi
|
|
||||||
chmod a+x /usr/share/dispsetup.sh
|
|
||||||
fi
|
fi
|
||||||
if [ $RET -eq $CURRENT ]; then
|
if [ $RET -eq $CURRENT ]; then
|
||||||
ASK_TO_REBOOT=1
|
ASK_TO_REBOOT=1
|
||||||
@ -2911,7 +2884,6 @@ do_display_menu() {
|
|||||||
if is_fkms; then
|
if is_fkms; then
|
||||||
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Display Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
|
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Display Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
|
||||||
"D2 Underscan" "Remove black border around screen" \
|
"D2 Underscan" "Remove black border around screen" \
|
||||||
"D3 Pixel Doubling" "Enable/disable 2x2 pixel mapping" \
|
|
||||||
"D4 Screen Blanking" "Enable/disable screen blanking" \
|
"D4 Screen Blanking" "Enable/disable screen blanking" \
|
||||||
"D5 VNC Resolution" "Set resolution for headless use" \
|
"D5 VNC Resolution" "Set resolution for headless use" \
|
||||||
"D6 Composite" "Set options for composite output" \
|
"D6 Composite" "Set options for composite output" \
|
||||||
@ -2928,7 +2900,7 @@ do_display_menu() {
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Display Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
|
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Display Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
|
||||||
"D3 Pixel Doubling" "Enable/disable 2x2 pixel mapping" \
|
"D2 Underscan" "Remove black border around screen" \
|
||||||
"D4 Screen Blanking" "Enable/disable screen blanking" \
|
"D4 Screen Blanking" "Enable/disable screen blanking" \
|
||||||
3>&1 1>&2 2>&3)
|
3>&1 1>&2 2>&3)
|
||||||
fi
|
fi
|
||||||
@ -2938,7 +2910,7 @@ do_display_menu() {
|
|||||||
elif [ $RET -eq 0 ]; then
|
elif [ $RET -eq 0 ]; then
|
||||||
case "$FUN" in
|
case "$FUN" in
|
||||||
D1\ *) do_resolution ;;
|
D1\ *) do_resolution ;;
|
||||||
D2\ *) if is_fkms ; then
|
D2\ *) if is_fkms || ! is_pi ; then
|
||||||
do_overscan_kms
|
do_overscan_kms
|
||||||
else
|
else
|
||||||
do_overscan
|
do_overscan
|
||||||
|
Loading…
Reference in New Issue
Block a user