Unverified Commit 371c7b82 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

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

linuxPackages_6_2.nvidia_x11: disable ibt
parents de8676bd d120c530

nixos/modules/hardware/video/nvidia.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 =

      ''

pkgs/os-specific/linux/nvidia-x11/generic.nix

+1 −2
Original line number Diff line number Diff line
@@ -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;

    };

  };