Revert "hardware.gpu: fix nvidia beta driver"

This reverts commit 5efee599f7.
This commit is contained in:
2024-06-14 19:04:04 +08:00
parent 0ce31201a9
commit a7b0906488
2 changed files with 6 additions and 7 deletions

View File

@@ -149,6 +149,7 @@ inputs:
"mt7921e.disable_aspm=y" # 避免休眠恢复后无wifi
"amdgpu.sg_display=0" # 混合模式下避免外接屏幕闪烁,和内置外接屏幕延迟
"acpi.ec_no_wakeup" # 睡眠时避免开盖唤醒
"nvidia.NVreg_EnableGpuFirmware=0"
];
# 禁止鼠标等在睡眠时唤醒
services.udev.extraRules = ''ACTION=="add", ATTR{power/wakeup}="disabled"'';
@@ -161,6 +162,7 @@ inputs:
(dir: { directory = "repo/${dir}"; user = "chn"; group = "chn"; mode = "0755"; })
[ "lammps-SiC" "BPD-paper" "kurumi-asmr" "linwei-stuff" "BPD-paper-old" ];
};
hardware.nvidia.open = inputs.lib.mkForce false;
specialisation =
{
nvidia.configuration =

View File

@@ -68,17 +68,14 @@ inputs:
let actualDriver = { production = "legacy_535"; }.${gpu.nvidia.driver} or gpu.nvidia.driver;
in inputs.config.boot.kernelPackages.nvidiaPackages.${actualDriver};
prime.allowExternalGpu = true;
# nvidia 555 package have some bug, should use open
open = inputs.lib.mkIf (gpu.nvidia.driver == "beta") true;
};
};
boot =
{
kernelParams =
let params =
{
amd = [ "radeon.cik_support=0" "amdgpu.cik_support=1" "radeon.si_support=0" "amdgpu.si_support=1" ];
nvidia = if gpu.nvidia.driver == "beta" then [ "nvidia.NVreg_EnableGpuFirmware=0" ] else [];
};
in builtins.concatLists (builtins.map (gpu: params.gpu or []) gpus);
kernelParams = inputs.lib.mkIf (builtins.elem "amd" gpus)
[ "radeon.cik_support=0" "amdgpu.cik_support=1" "radeon.si_support=0" "amdgpu.si_support=1" ];
blacklistedKernelModules = [ "nouveau" ];
};
environment.variables.VDPAU_DRIVER = inputs.lib.mkIf (builtins.elem "intel" gpus) "va_gl";