Skip to content
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

MBa8MPxL: cleanup fix X11 settings #7759

Merged
merged 1 commit into from
Jan 30, 2025
Merged

MBa8MPxL: cleanup fix X11 settings #7759

Show file tree
Hide file tree
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
37 changes: 18 additions & 19 deletions config/boards/mba8mpxl-ras314.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,27 @@ function post_family_tweaks_bsp__mba8mpxl-ras314() {
run_host_command_logged cp -Pv "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"

# Add udev rule to delay btnxpuart loading
cat <<- EOF > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
cat <<- NXP_UDEV_RULE > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
# wait until combo FW is loaded by wifi driver
KERNEL=="mlan*", ACTION=="add", RUN+="/sbin/modprobe btnxpuart"
EOF
NXP_UDEV_RULE

if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
# fix X11 config
mkdir -p "$destination"/etc/X11/xorg.conf.d
cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
Section "Device"
Identifier "etnaviv"
Driver "modesetting"
Option "kmsdev" "/dev/dri/card1"
Option "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
Option "Atomic" "On"
EndSection
# fix X11 config
mkdir -p "$destination"/etc/X11/xorg.conf.d

Section "ServerFlags"
Option "AutoAddGPU" "false"
Option "DRI" "3"
EndSection
XORG_HDMI_CONF
fi
cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
Section "Device"
Identifier "etnaviv"
Driver "modesetting"
Option "kmsdev" "/dev/dri/card1"
Option "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
Option "Atomic" "On"
EndSection

Section "ServerFlags"
Option "AutoAddGPU" "false"
Option "DRI" "3"
EndSection
XORG_HDMI_CONF

}
34 changes: 17 additions & 17 deletions config/boards/mba8mpxl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ ASOUND_STATE="asound.state.tqma"

function post_family_tweaks_bsp__mba8mpxl() {

if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
# fix X11 config
mkdir -p "$destination"/etc/X11/xorg.conf.d
cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
Section "Device"
Identifier "etnaviv"
Driver "modesetting"
Option "kmsdev" "/dev/dri/card1"
Option "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
Option "Atomic" "On"
EndSection
# fix X11 config
mkdir -p "$destination"/etc/X11/xorg.conf.d

cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
Section "Device"
Identifier "etnaviv"
Driver "modesetting"
Option "kmsdev" "/dev/dri/card1"
Option "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
Option "Atomic" "On"
EndSection

Section "ServerFlags"
Option "AutoAddGPU" "false"
Option "DRI" "3"
EndSection
XORG_HDMI_CONF

Section "ServerFlags"
Option "AutoAddGPU" "false"
Option "DRI" "3"
EndSection
XORG_HDMI_CONF
fi
}
Loading