summary refs log tree commit diff
path: root/nixos/modules/hardware
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-03-28 08:23:48 +0800
committerGitHub <noreply@github.com>2023-03-28 08:23:48 +0800
commitca7c52c4f514952d9cb70a20364f93f1a84e8b49 (patch)
treee444dc6b34e652fe08c8b28b7142f59978c7b849 /nixos/modules/hardware
parent95784e44ff805b0d835d811d55814484377e1f7a (diff)
parent90c44c959814b11009fe3abb33344fa6f5e6d290 (diff)
Merge pull request #222762 from Kiskae/nvidia/530.41.03
linuxPackages.nvidia_x11: 525.89.02 -> 530.41.03
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r--nixos/modules/hardware/video/nvidia.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 434931ccae5a7..79a3ab6baaab2 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -462,8 +462,7 @@ in
     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"
-      # proprietary driver is not compiled with support for X86_KERNEL_IBT
-      ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off";
+      ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && lib.versionOlder nvidia_x11.version "530") "ibt=off";
 
     services.udev.extraRules =
       ''