Revert "xorg-server: fix udev rule to work with drivers as modules or statically builtin"

This reverts commit 31667b1b371a735054070c716131e5571cfc78d8.
This commit is contained in:
Stephan Raue 2013-10-13 12:15:05 +02:00
parent 5de64302a9
commit d4e6c29942

View File

@ -20,16 +20,27 @@
ACTION!="add|change", GOTO="end_video"
# xorg_start only does something for subsystem "pci" and "video" class.
SUBSYSTEM=="pci", ATTR{class}=="0x030000", GOTO="subsystem_pci"
SUBSYSTEM=="drivers", GOTO="subsystem_drivers"
GOTO="end_video"
# check for drivers dont use the pci substem
SUBSYSTEM=="drivers", KERNEL=="dovefb", ENV{xorg_driver}="dove", GOTO="start_xorg"
SUBSYSTEM=="drivers", KERNEL=="fglrx_pci", ENV{xorg_driver}="fglrx", GOTO="start_xorg"
SUBSYSTEM=="drivers", KERNEL=="fglrx_legacy_pci", ENV{xorg_driver}="fglrx-legacy", GOTO="start_xorg"
SUBSYSTEM=="drivers", KERNEL=="i915", ENV{xorg_driver}="i915", GOTO="start_xorg"
SUBSYSTEM=="drivers", KERNEL=="nouveau", ENV{xorg_driver}="nouveau", GOTO="start_xorg"
SUBSYSTEM=="drivers", KERNEL=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg"
SUBSYSTEM=="drivers", KERNEL=="radeon", ENV{xorg_driver}="radeon", GOTO="start_xorg"
SUBSYSTEM=="drivers", KERNEL=="vboxvideo", ENV{xorg_driver}="vboxvideo", GOTO="start_xorg"
SUBSYSTEM=="drivers", KERNEL=="vmwgfx", ENV{xorg_driver}="vmware", GOTO="start_xorg"
LABEL="subsystem_drivers"
KERNEL=="dovefb", ENV{xorg_driver}="dove", GOTO="start_xorg"
KERNEL=="fglrx_pci", ENV{xorg_driver}="fglrx", GOTO="start_xorg"
KERNEL=="fglrx_legacy_pci", ENV{xorg_driver}="fglrx-legacy", GOTO="start_xorg"
KERNEL=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg"
KERNEL=="vboxvideo", ENV{xorg_driver}="vboxvideo", GOTO="start_xorg"
KERNEL=="vmwgfx", ENV{xorg_driver}="vmware", 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=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg"
DRIVER=="radeon", ENV{xorg_driver}="radeon", GOTO="start_xorg"
GOTO="end_video"
# start Xorg