Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xf86-video-nvidia: adjust udev rule to ignore non display devices #4766

Merged
merged 1 commit into from Feb 24, 2016
Merged

xf86-video-nvidia: adjust udev rule to ignore non display devices #4766

merged 1 commit into from Feb 24, 2016

Conversation

lrusak
Copy link
Contributor

@lrusak lrusak commented Feb 24, 2016

Thanks @MilhouseVH for pointing this out. The udev rule would catch the audio device on the nvidia card. This fixes this and grabs the correct device.

This is before:

OpenELEC:~ # udevadm info /sys/bus/pci/devices/0000\:00\:01.0/0000\:01\:00.0/
P: /devices/pci0000:00/0000:00:01.0/0000:01:00.0
E: DEVPATH=/devices/pci0000:00/0000:00:01.0/0000:01:00.0
E: DRIVER=nvidia
E: ID_MODEL_FROM_DATABASE=GF114 [GeForce GTX 560]
E: ID_PCI_CLASS_FROM_DATABASE=Display controller
E: ID_PCI_INTERFACE_FROM_DATABASE=VGA controller
E: ID_PCI_SUBCLASS_FROM_DATABASE=VGA compatible controller
E: ID_VENDOR_FROM_DATABASE=NVIDIA Corporation
E: MODALIAS=pci:v000010DEd00001201sv00001458sd00003527bc03sc00i00
E: PCI_CLASS=30000
E: PCI_ID=10DE:1201
E: PCI_SLOT_NAME=0000:01:00.0
E: PCI_SUBSYS_ID=1458:3527
E: SUBSYSTEM=pci
E: SYSTEMD_WANTS=xorg-configure@nvidia.service
E: TAGS=:systemd:
E: USEC_INITIALIZED=8641443
E: xorg_driver=nvidia

OpenELEC:~ # udevadm info /sys/class/sound/card1/
P: /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1
E: DEVPATH=/devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1
E: ID_BUS=pci
E: ID_FOR_SEAT=sound-pci-0000_01_00_1
E: ID_MODEL_FROM_DATABASE=GF114 HDMI Audio Controller
E: ID_MODEL_ID=0x0e0c
E: ID_PATH=pci-0000:01:00.1
E: ID_PATH_TAG=pci-0000_01_00_1
E: ID_PCI_CLASS_FROM_DATABASE=Multimedia controller
E: ID_PCI_SUBCLASS_FROM_DATABASE=Audio device
E: ID_VENDOR_FROM_DATABASE=NVIDIA Corporation
E: ID_VENDOR_ID=0x10de
E: SOUND_INITIALIZED=1
E: SUBSYSTEM=sound
E: SYSTEMD_WANTS=xorg-configure@nvidia-legacy.service sound.target
E: TAGS=:systemd:seat:
E: USEC_INITIALIZED=9331151
E: xorg_driver=nvidia

and after:

OpenELEC:~ # udevadm info -p $(udevadm info -q path /sys/bus/pci/devices/0000\:00\:01.0/0000\:01\:00.0/)
P: /devices/pci0000:00/0000:00:01.0/0000:01:00.0
E: DEVPATH=/devices/pci0000:00/0000:00:01.0/0000:01:00.0
E: DRIVER=nvidia
E: ID_MODEL_FROM_DATABASE=GF114 [GeForce GTX 560]
E: ID_PCI_CLASS_FROM_DATABASE=Display controller
E: ID_PCI_INTERFACE_FROM_DATABASE=VGA controller
E: ID_PCI_SUBCLASS_FROM_DATABASE=VGA compatible controller
E: ID_VENDOR_FROM_DATABASE=NVIDIA Corporation
E: MODALIAS=pci:v000010DEd00001201sv00001458sd00003527bc03sc00i00
E: PCI_CLASS=30000
E: PCI_ID=10DE:1201
E: PCI_SLOT_NAME=0000:01:00.0
E: PCI_SUBSYS_ID=1458:3527
E: SUBSYSTEM=pci
E: SYSTEMD_WANTS=xorg-configure@nvidia.service
E: TAGS=:systemd:
E: USEC_INITIALIZED=11261097
E: xorg_driver=nvidia

OpenELEC:~ # udevadm info -p $(udevadm info -q path /sys/bus/pci/devices/0000\:00\:01.0/0000\:01\:00.1/)
P: /devices/pci0000:00/0000:00:01.0/0000:01:00.1
E: DEVPATH=/devices/pci0000:00/0000:00:01.0/0000:01:00.1
E: DRIVER=snd_hda_intel
E: ID_MODEL_FROM_DATABASE=GF114 HDMI Audio Controller
E: ID_PCI_CLASS_FROM_DATABASE=Multimedia controller
E: ID_PCI_SUBCLASS_FROM_DATABASE=Audio device
E: ID_VENDOR_FROM_DATABASE=NVIDIA Corporation
E: MODALIAS=pci:v000010DEd00000E0Csv00001458sd00003527bc04sc03i00
E: PCI_CLASS=40300
E: PCI_ID=10DE:0E0C
E: PCI_SLOT_NAME=0000:01:00.1
E: PCI_SUBSYS_ID=1458:3527
E: SUBSYSTEM=pci
E: USEC_INITIALIZED=11260893

@lrusak lrusak added this to the 6.95.1 milestone Feb 24, 2016
sraue added a commit that referenced this pull request Feb 24, 2016
xf86-video-nvidia: adjust udev rule to ignore non display devices
@sraue sraue merged commit ac75813 into OpenELEC:master Feb 24, 2016
@lrusak lrusak deleted the nvidia-fix branch March 29, 2016 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants