brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2024-12-22 20:20:06 +09:00
Code Issues Projects Releases Wiki Activity

Remove fake KMS option

Browse Source
This commit is contained in:
Simon Long 2021-09-24 14:34:17 +01:00
parent a558510918
commit 22c1841c2d
2 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
raspi-config (20210924) bullseye; urgency=medium
* Remove fake KMS option
-- Simon Long <simon@raspberrypi.com> Fri, 24 Sep 2021 14:32:52 +0100
raspi-config (20210922) bullseye; urgency=medium raspi-config (20210922) bullseye; urgency=medium
* Handle 73-usb-net-by-mac.link when toggling network names * Handle 73-usb-net-by-mac.link when toggling network names

40
raspi-config
View File

@ -1770,52 +1770,21 @@ do_gldriver() {
whiptail --msgbox "Required packages not found, please install: ${missing_packages}" 20 60 2 whiptail --msgbox "Required packages not found, please install: ${missing_packages}" 20 60 2
return 1 return 1
fi fi
if is_pifour ; then
GLOPT=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "GL Driver" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \ GLOPT=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "GL Driver" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \
"G1 Legacy" "Original non-GL desktop driver" \ "G1 Legacy" "Original non-GL desktop driver" \
"G2 GL (Fake KMS)" "OpenGL desktop driver with fake KMS" \ "G2 GL (Full KMS)" "OpenGL desktop driver with full KMS" \
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
else
GLOPT=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "GL Driver" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \
"G1 Legacy" "Original non-GL desktop driver" \
"G2 GL (Fake KMS)" "OpenGL desktop driver with fake KMS" \
"G3 GL (Full KMS)" "OpenGL desktop driver with full KMS" \
3>&1 1>&2 2>&3)
fi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
case "$GLOPT" in case "$GLOPT" in
G1*) G1*)
if is_pifour ; then if sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q -E "^dtoverlay=vc4-f?kms-v3d" ; then
if grep -q -E "^dtoverlay=vc4-f?kms-v3d" $CONFIG; then ASK_TO_REBOOT=1
ASK_TO_REBOOT=1
fi
else
if sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q -E "^dtoverlay=vc4-f?kms-v3d" ; then
ASK_TO_REBOOT=1
fi
fi fi
sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/g"
sed $CONFIG -i -e "s/^dtoverlay=vc4-fkms-v3d/#dtoverlay=vc4-fkms-v3d/g" sed $CONFIG -i -e "s/^dtoverlay=vc4-fkms-v3d/#dtoverlay=vc4-fkms-v3d/g"
sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/g"
STATUS="The GL driver is disabled." STATUS="The GL driver is disabled."
;; ;;
G2*) G2*)
if is_pifour ; then
if ! grep -q -E "^dtoverlay=vc4-fkms-v3d" $CONFIG; then
ASK_TO_REBOOT=1
fi
else
if ! sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q "^dtoverlay=vc4-fkms-v3d" ; then
ASK_TO_REBOOT=1
fi
fi
sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/g"
sed $CONFIG -i -e "s/^#dtoverlay=vc4-fkms-v3d/dtoverlay=vc4-fkms-v3d/g"
if ! sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q "^dtoverlay=vc4-fkms-v3d" ; then
printf "[all]\ndtoverlay=vc4-fkms-v3d\n" >> $CONFIG
fi
STATUS="The fake KMS GL driver is enabled."
;;
G3*)
if ! sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q "^dtoverlay=vc4-kms-v3d" ; then if ! sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q "^dtoverlay=vc4-kms-v3d" ; then
ASK_TO_REBOOT=1 ASK_TO_REBOOT=1
fi fi
@ -2811,7 +2780,6 @@ do_advanced_menu() {
if is_pifour ; then if is_pifour ; then
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Advanced 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 "Advanced Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
"A1 Expand Filesystem" "Ensures that all of the SD card is available" \ "A1 Expand Filesystem" "Ensures that all of the SD card is available" \
"A2 GL Driver" "Enable/disable experimental desktop GL driver" \
"A3 Compositor" "Enable/disable xcompmgr composition manager" \ "A3 Compositor" "Enable/disable xcompmgr composition manager" \
"A4 Network Interface Names" "Enable/disable predictable network i/f names" \ "A4 Network Interface Names" "Enable/disable predictable network i/f names" \
"A5 Network Proxy Settings" "Configure network proxy settings" \ "A5 Network Proxy Settings" "Configure network proxy settings" \