b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #217718 from Kiskae/nvidia/unbreak-6.2

Browse source 
linuxPackages_6_2.nvidia_x11: disable ibt
This commit is contained in:
superherointj 2023-02-24 17:46:26 -03:00 committed by GitHub
parent de8676bd53 d120c53077
commit 371c7b8239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/hardware/video/nvidia.nix
View file

@ -461,7 +461,9 @@ in
# If requested enable modesetting via kernel parameter.
boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1";
++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
# proprietary driver is not compiled with support for X86_KERNEL_IBT
++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off";
services.udev.extraRules =
''

3
pkgs/os-specific/linux/nvidia-x11/generic.nix
View file

@ -127,8 +127,7 @@ let
platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ];
maintainers = with maintainers; [ jonringer ];
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
# proprietary driver currently does not support X86_KERNEL_IBT, which is scheduled to be added in linux 6.2
broken = broken || (kernel != null && kernel.kernelAtLeast "6.2");
inherit broken;
};
};