Unverified Commit 0645e675 authored by MakiseKurisu's avatar MakiseKurisu
Browse files

nixos/nvidia: update busIDType to correctly handle PCI bus domain 

There are real devices with 32-bit domain ID 0x10000, which needs 10 digits to represent at the worst case (0xffffffff): open-mpi/hwloc#354

Current test will deny those devices since the field was expecting a Bus ID, which is only 8-bit wide.

Format: https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/hw/xfree86/common/xf86pciBus.c#L263

Fixes: ce2e4707
parent b0ceaa66

nixos/modules/hardware/video/nvidia.nix

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ let 
  offloadCfg = pCfg.offload;

  reverseSyncCfg = pCfg.reverseSync;

  primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable;

  busIDType = lib.types.strMatching "([[:print:]]+[:@][0-9]{1,3}:[0-9]{1,2}:[0-9])?";

  busIDType = lib.types.strMatching "([[:print:]]+:[0-9]{1,3}(@[0-9]{1,10})?:[0-9]{1,2}:[0-9])?";

  ibtSupport = useOpenModules || (nvidia_x11.ibtSupport or false);

  settingsFormat = pkgs.formats.keyValue { };

in