Merge pull request #1767 from CvH/8.2-vm-xorg

missing nvidia related backports from master
This commit is contained in:
Christian Hewitt 2017-07-10 00:14:45 +04:00 committed by GitHub
commit 4e21006d85
3 changed files with 8 additions and 11 deletions

View File

@ -20,7 +20,7 @@ PKG_NAME="xf86-video-nvidia"
# Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to
# "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version.
# Host may require installation of python-lxml and python-requests packages.
PKG_VERSION="375.39"
PKG_VERSION="375.66"
PKG_ARCH="x86_64"
PKG_LICENSE="nonfree"
PKG_SITE="http://www.nvidia.com/"

View File

@ -92,8 +92,6 @@ ATTRS{device}=="0x0fea", GOTO="configure_nvidia"
ATTRS{device}=="0x0fec", GOTO="configure_nvidia"
ATTRS{device}=="0x0fed", GOTO="configure_nvidia"
ATTRS{device}=="0x0fee", GOTO="configure_nvidia"
ATTRS{device}=="0x0fef", GOTO="configure_nvidia"
ATTRS{device}=="0x0ff2", GOTO="configure_nvidia"
ATTRS{device}=="0x0ff3", GOTO="configure_nvidia"
ATTRS{device}=="0x0ff6", GOTO="configure_nvidia"
ATTRS{device}=="0x0ff8", GOTO="configure_nvidia"
@ -190,7 +188,6 @@ ATTRS{device}=="0x11ba", GOTO="configure_nvidia"
ATTRS{device}=="0x11bc", GOTO="configure_nvidia"
ATTRS{device}=="0x11bd", GOTO="configure_nvidia"
ATTRS{device}=="0x11be", GOTO="configure_nvidia"
ATTRS{device}=="0x11bf", GOTO="configure_nvidia"
ATTRS{device}=="0x11c0", GOTO="configure_nvidia"
ATTRS{device}=="0x11c2", GOTO="configure_nvidia"
ATTRS{device}=="0x11c3", GOTO="configure_nvidia"
@ -259,6 +256,7 @@ ATTRS{device}=="0x134d", GOTO="configure_nvidia"
ATTRS{device}=="0x134e", GOTO="configure_nvidia"
ATTRS{device}=="0x134f", GOTO="configure_nvidia"
ATTRS{device}=="0x137a", GOTO="configure_nvidia"
ATTRS{device}=="0x137b", GOTO="configure_nvidia"
ATTRS{device}=="0x137d", GOTO="configure_nvidia"
ATTRS{device}=="0x1380", GOTO="configure_nvidia"
ATTRS{device}=="0x1381", GOTO="configure_nvidia"
@ -321,6 +319,8 @@ ATTRS{device}=="0x17f0", GOTO="configure_nvidia"
ATTRS{device}=="0x17f1", GOTO="configure_nvidia"
ATTRS{device}=="0x17fd", GOTO="configure_nvidia"
ATTRS{device}=="0x1b00", GOTO="configure_nvidia"
ATTRS{device}=="0x1b02", GOTO="configure_nvidia"
ATTRS{device}=="0x1b06", GOTO="configure_nvidia"
ATTRS{device}=="0x1b30", GOTO="configure_nvidia"
ATTRS{device}=="0x1b38", GOTO="configure_nvidia"
ATTRS{device}=="0x1b80", GOTO="configure_nvidia"
@ -331,6 +331,9 @@ ATTRS{device}=="0x1ba1", GOTO="configure_nvidia"
ATTRS{device}=="0x1bb0", GOTO="configure_nvidia"
ATTRS{device}=="0x1bb1", GOTO="configure_nvidia"
ATTRS{device}=="0x1bb3", GOTO="configure_nvidia"
ATTRS{device}=="0x1bb6", GOTO="configure_nvidia"
ATTRS{device}=="0x1bb7", GOTO="configure_nvidia"
ATTRS{device}=="0x1bb8", GOTO="configure_nvidia"
ATTRS{device}=="0x1be0", GOTO="configure_nvidia"
ATTRS{device}=="0x1be1", GOTO="configure_nvidia"
ATTRS{device}=="0x1c02", GOTO="configure_nvidia"

View File

@ -20,13 +20,6 @@ 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=="vboxvideo", ENV{xorg_driver}="modesetting", 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
@ -34,6 +27,7 @@ LABEL="subsystem_pci"
DRIVER=="i915", ENV{xorg_driver}="i915", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@i915.service"
DRIVER=="amdgpu", ENV{xorg_driver}="amdgpu", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@amdgpu.service"
DRIVER=="radeon", ENV{xorg_driver}="radeon", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@radeon.service"
DRIVER=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service"
GOTO="end_video"
LABEL="end_video"