mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 21:26:49 +00:00
xorg-server:
- force loading of nvidia driver if we have an nvidia graphic card
This commit is contained in:
parent
7e220fb435
commit
7989168790
@ -11,6 +11,7 @@
|
|||||||
DISPLAY=':0.0'
|
DISPLAY=':0.0'
|
||||||
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
|
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
|
||||||
XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor"
|
XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor"
|
||||||
|
XORG_NVIDIA_MODULE="nvidia"
|
||||||
|
|
||||||
export DISPLAY
|
export DISPLAY
|
||||||
|
|
||||||
@ -23,21 +24,24 @@ export DISPLAY
|
|||||||
start_xorg() {
|
start_xorg() {
|
||||||
|
|
||||||
if lspci -n | grep 0300 | grep -q 10de; then
|
if lspci -n | grep 0300 | grep -q 10de; then
|
||||||
progress "Found nVidia card, enabling binary driver as requested"
|
|
||||||
|
|
||||||
XORG_ARGS="$XORG_ARGS -ignoreABI"
|
XORG_ARGS="$XORG_ARGS -ignoreABI"
|
||||||
[ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
|
[ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
|
||||||
|
|
||||||
mkdir -p /var/lib
|
progress "Found nVidia card, loading kernel driver"
|
||||||
ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
|
modprobe $XORG_NVIDIA_MODULE >/dev/null 2>&1 &
|
||||||
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
|
||||||
|
progress "Found nVidia card, enabling binary driver as requested"
|
||||||
|
mkdir -p /var/lib
|
||||||
|
ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
|
||||||
|
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
||||||
|
|
||||||
else
|
else
|
||||||
progress "Not found nVidia card, enabling OSS driver as requested"
|
|
||||||
|
|
||||||
mkdir -p /var/lib
|
progress "Not found nVidia card, enabling OSS driver as requested"
|
||||||
ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
|
mkdir -p /var/lib
|
||||||
ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
|
ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
|
||||||
|
ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p /var/cache/xkb
|
mkdir -p /var/cache/xkb
|
||||||
@ -46,6 +50,6 @@ export DISPLAY
|
|||||||
|
|
||||||
wait_for_xorg () {
|
wait_for_xorg () {
|
||||||
while [ ! -f /tmp/.X0-lock ]; do
|
while [ ! -f /tmp/.X0-lock ]; do
|
||||||
sleep 0.5
|
sleep 1
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user