diff options
author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2022-04-30 15:34:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-30 15:34:16 +0200 |
commit | 536528ede8932f6b6ac697dc0be9a2b1b7be93f4 (patch) | |
tree | 302d42f744c680fd09fcdf6cad513545b58bebb0 /nixos/modules/hardware | |
parent | 9cb6d34b281192270bfafc3de7affb4e3a50552b (diff) | |
parent | 4d7bc6ccc0167df08cf6ee3ed58928199184c094 (diff) | |
download | nixpkgs-536528ede8932f6b6ac697dc0be9a2b1b7be93f4.tar nixpkgs-536528ede8932f6b6ac697dc0be9a2b1b7be93f4.tar.gz nixpkgs-536528ede8932f6b6ac697dc0be9a2b1b7be93f4.tar.bz2 nixpkgs-536528ede8932f6b6ac697dc0be9a2b1b7be93f4.tar.lz nixpkgs-536528ede8932f6b6ac697dc0be9a2b1b7be93f4.tar.xz nixpkgs-536528ede8932f6b6ac697dc0be9a2b1b7be93f4.tar.zst nixpkgs-536528ede8932f6b6ac697dc0be9a2b1b7be93f4.zip |
Merge pull request #170695 from matshch/fix/nvidia-device-minor
nixos/nvidia: fix /dev/nvidia* devices minors
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r-- | nixos/modules/hardware/video/nvidia.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 6899eb4e196..210d45ac841 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -361,11 +361,12 @@ in services.udev.extraRules = '' # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" - KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" - KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'" + KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c 195 254'" + KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", PROGRAM="${pkgs.gnugrep}/bin/grep 'Device Minor:' /proc/driver/nvidia/gpus/%b/information", \ + RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%c{3} c 195 %c{3}" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" - KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" + KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" '' + optionalString cfg.powerManagement.finegrained '' # Remove NVIDIA USB xHCI Host Controller devices, if present ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1" |