From 79c6be8d821d87dff198aa7d08c28d3c1e9dfd91 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 25 Feb 2011 23:15:46 +0100
Subject: [PATCH] xorg-server: fixing udev rule to start correctly with nvidia
 drivers as well with OSS included in kernel

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../xserver/xorg-server/scripts/xorg_start    |  6 ++--
 .../xserver/xorg-server/udev.d/97-xorg.rules  | 33 +++++++++++++++----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start
index 68ea14d275..6dadeb9478 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg_start
+++ b/packages/x11/xserver/xorg-server/scripts/xorg_start
@@ -24,7 +24,7 @@
 
 if [ "$RUNLEVEL" = openelec ]; then
 
-  logger -t Xorg "### starting Xorg with driver $1 ###"
+  logger -t Xorg "### starting Xorg with driver ${xorg_driver} ###"
 
   ##############################################################################
   # setup xorg.conf paths
@@ -33,7 +33,7 @@ if [ "$RUNLEVEL" = openelec ]; then
   logger -t Xorg "### setup xorg.conf paths ###"
 
   XORG_CONF_DEFAULT="/etc/X11/xorg.conf"
-  XORG_CONF_DRIVER="/etc/X11/xorg-$1.conf"
+  XORG_CONF_DRIVER="/etc/X11/xorg-${xorg_driver}.conf"
   XORG_CONF_USER="/storage/.config/xorg.conf"
 
   ##############################################################################
@@ -68,7 +68,7 @@ if [ "$RUNLEVEL" = openelec ]; then
   mkdir -m 1777 -p /tmp/.ICE-unix
   chown root:root /tmp/.ICE-unix
 
-  if [ "$1" = "nvidia" ]; then
+  if [ "${xorg_driver}" = "nvidia" ]; then
     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
     XORG_ARGS="$XORG_ARGS -ignoreABI"
diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
index 7746f1fd71..536a82b63a 100644
--- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
+++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
@@ -18,13 +18,32 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-# only does something with "drivers" subsystem devices and supported hardware.
-SUBSYSTEM!="drivers", GOTO="end"
+ACTION!="add|change", GOTO="end_video"
 
-KERNEL!="i915", KERNEL!="nouveau", KERNEL!="nvidia", KERNEL!="radeon", \
-KERNEL!="vmware", GOTO="end"
+# xorg_start only does something for subsystem "pci" and "video" class.
+SUBSYSTEM=="pci", ATTR{class}=="0x030000", GOTO="subsystem_pci"
+SUBSYSTEM=="drivers", GOTO="subsystem_drivers"
 
-# Start Xorg based on the loaded drm driver
-ACTION=="add|change", RUN+="/lib/udev/xorg_start %k"
+# check for drivers dont use the pci substem
+LABEL="subsystem_drivers"
 
-LABEL="end"
+KERNEL=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg"
+
+GOTO="end_video"
+
+# check for drivers using the pci substem
+LABEL="subsystem_pci"
+
+DRIVER=="i915",    ENV{xorg_driver}="i915",    GOTO="start_xorg"
+DRIVER=="nouveau", ENV{xorg_driver}="nouveau", GOTO="start_xorg"
+DRIVER=="radeon",  ENV{xorg_driver}="radeon",  GOTO="start_xorg"
+#DRIVER=="vmware",  ENV{xorg_driver}="vmware",  GOTO="start_xorg"
+
+GOTO="end_video"
+
+# start Xorg
+LABEL="start_xorg"
+
+ACTION=="add|change", RUN+="/lib/udev/xorg_start"
+
+LABEL="end_video"