hardware.gpu: fix

This commit is contained in:
陈浩南 2024-02-16 15:01:24 +08:00
parent 7f8f65649b
commit 7d584a6563

View File

@ -25,7 +25,7 @@ inputs:
let modules = let modules =
{ {
intel = [ "i915" ]; intel = [ "i915" ];
nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" "nvidia_uvm" ]; nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" ]; # nvidia-uvm should not be loaded
amd = [ "amdgpu" ]; amd = [ "amdgpu" ];
}; };
in builtins.concatLists (builtins.map (gpu: modules.${gpu}) gpus); in builtins.concatLists (builtins.map (gpu: modules.${gpu}) gpus);
@ -57,8 +57,12 @@ inputs:
# package = inputs.config.boot.kernelPackages.nvidiaPackages.production; # package = inputs.config.boot.kernelPackages.nvidiaPackages.production;
}; };
}; };
boot.kernelParams = inputs.lib.mkIf (builtins.elem "amd" gpus) 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" ]; [ "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"; environment.variables.VDPAU_DRIVER = inputs.lib.mkIf (builtins.elem "intel" gpus) "va_gl";
services.xserver.videoDrivers = services.xserver.videoDrivers =
let driver = { intel = "modesetting"; amd = "amdgpu"; nvidia = "nvidia"; }; let driver = { intel = "modesetting"; amd = "amdgpu"; nvidia = "nvidia"; };