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

This reverts commit 7793693d02c121d5dcff0d74aaa04816d074cf3f.

before:
Oct 11 09:36:18 openelec Xorg[267]: creating needed directories and symlinks for driver: i915
Oct 11 09:36:18 openelec Xorg[268]: creating needed directories and symlinks for driver: radeon
Oct 11 09:36:18 openelec Xorg[463]: creating needed directories and symlinks for driver: nvidia
^^ I have only nvidia.

now:
Oct 11 09:54:30 openelec Xorg[485]: creating needed directories and symlinks for driver: nvidia

this is a regression. don't touch it before we compile ALL drm kernel drivers as modules.
This commit is contained in:
Stefan Saraev 2013-10-11 12:56:16 +03:00
parent 73452734a9
commit a4b62c0017

View File

@ -18,15 +18,26 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
ACTION!="add|change", SUBSYSTEM!="drivers", GOTO="end_video"
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
LABEL="subsystem_drivers"
KERNEL=="dovefb", ENV{xorg_driver}="dove", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@dove.service"
KERNEL=="i915", ENV{xorg_driver}="i915", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@i915.service"
KERNEL=="nouveau", ENV{xorg_driver}="nouveau", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@nouveau.service"
KERNEL=="nvidia", ENV{xorg_driver}="nvidia", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@nvidia.service"
KERNEL=="radeon", ENV{xorg_driver}="radeon", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@radeon.service"
KERNEL=="vboxvideo", ENV{xorg_driver}="vboxvideo", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vboxvideo.service"
KERNEL=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service"
GOTO="end_video"
# check for drivers using the pci substem
LABEL="subsystem_pci"
DRIVER=="i915", ENV{xorg_driver}="i915", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@i915.service"
DRIVER=="nouveau", ENV{xorg_driver}="nouveau", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@nouveau.service"
DRIVER=="radeon", ENV{xorg_driver}="radeon", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@radeon.service"
GOTO="end_video"
LABEL="end_video"