From 7989168790a50a18b5177d50b6807726cdda3e05 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 21 Jan 2010 14:52:45 +0100
Subject: [PATCH] xorg-server: - force loading of nvidia driver if we have an
 nvidia graphic card

---
 packages/x11/xserver/xorg-server/conf.d/xorg | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg
index d139c0ff61..05d73a3596 100644
--- a/packages/x11/xserver/xorg-server/conf.d/xorg
+++ b/packages/x11/xserver/xorg-server/conf.d/xorg
@@ -11,6 +11,7 @@
 DISPLAY=':0.0'
 XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
 XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor"
+XORG_NVIDIA_MODULE="nvidia"
 
 export DISPLAY
 
@@ -23,21 +24,24 @@ export DISPLAY
   start_xorg() {
 
     if lspci -n | grep 0300 | grep -q 10de; then
-      progress "Found nVidia card, enabling binary driver as requested"
 
       XORG_ARGS="$XORG_ARGS -ignoreABI"
       [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
 
-      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
+      progress "Found nVidia card, loading kernel driver"
+        modprobe $XORG_NVIDIA_MODULE >/dev/null 2>&1 &
+
+      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
-      progress "Not found nVidia card, enabling OSS driver as requested"
 
-      mkdir -p /var/lib
-        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
+      progress "Not found nVidia card, enabling OSS driver as requested"
+        mkdir -p /var/lib
+          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
 
     mkdir -p /var/cache/xkb
@@ -46,6 +50,6 @@ export DISPLAY
 
   wait_for_xorg () {
     while [ ! -f /tmp/.X0-lock ]; do
-      sleep 0.5
+      sleep 1
     done
   }