From 7d584a656333f6d9d239ac0b796c086495483026 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Fri, 16 Feb 2024 15:01:24 +0800
Subject: [PATCH] hardware.gpu: fix

---
 modules/hardware/gpu.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/hardware/gpu.nix b/modules/hardware/gpu.nix
index 34b61b74..58d0f356 100644
--- a/modules/hardware/gpu.nix
+++ b/modules/hardware/gpu.nix
@@ -25,7 +25,7 @@ inputs:
           let modules =
           {
             intel = [ "i915" ];
-            nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" "nvidia_uvm" ];
+            nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" ]; # nvidia-uvm should not be loaded
             amd = [ "amdgpu" ];
           };
           in builtins.concatLists (builtins.map (gpu: modules.${gpu}) gpus);
@@ -57,8 +57,12 @@ inputs:
             # package = inputs.config.boot.kernelPackages.nvidiaPackages.production;
           };
         };
-        boot.kernelParams = inputs.lib.mkIf (builtins.elem "amd" gpus)
-          [ "radeon.cik_support=0" "amdgpu.cik_support=1" "radeon.si_support=0" "amdgpu.si_support=1" "iommu=pt" ];
+        boot =
+        {
+          kernelParams = inputs.lib.mkIf (builtins.elem "amd" gpus)
+            [ "radeon.cik_support=0" "amdgpu.cik_support=1" "radeon.si_support=0" "amdgpu.si_support=1" "iommu=pt" ];
+          blacklistedKernelModules = [ "nouveau" ];
+        };
         environment.variables.VDPAU_DRIVER = inputs.lib.mkIf (builtins.elem "intel" gpus) "va_gl";
         services.xserver.videoDrivers =
           let driver = { intel = "modesetting"; amd = "amdgpu"; nvidia = "nvidia"; };