diff --git a/config/hosts/samhain/nixos.nix b/config/hosts/samhain/nixos.nix index 75eaac81..465a382d 100644 --- a/config/hosts/samhain/nixos.nix +++ b/config/hosts/samhain/nixos.nix @@ -77,7 +77,7 @@ in { vfio-pci = let vfio-pci-ids = [ "1002:67df" "1002:aaf0" # RX 580 - "1921:0014" # Renesas USB 3 + "1912:0014" # Renesas USB 3 "1022:149c" # CPU USB 3 ]; in mkIf (vfio-pci-ids != [ ]) { diff --git a/config/profiles/vfio/default.nix b/config/profiles/vfio/default.nix index 5e149a6d..f9dead19 100644 --- a/config/profiles/vfio/default.nix +++ b/config/profiles/vfio/default.nix @@ -18,6 +18,9 @@ with lib; boot = lib.mkMerge [ { initrd.kernelModules = mkBefore ["vfio" "vfio_iommu_type1" "vfio_pci" "vfio_virqfd"]; kernelModules = [ "i2c-dev" ]; # i2c-dev is required for DDC/CI for screenstub + kernelPatches = with pkgs.kernelPatches; [ + (mkIf config.deploy.profile.hardware.acs-override acs-override) + ]; } (mkIf (config.deploy.profile.hardware.amdgpu) { kernelParams = [ "video=efifb:off" @@ -26,16 +29,6 @@ with lib; (pkgs.linuxPackagesFor config.boot.kernelPackages.kernel).vendor-reset ]; }) ( mkIf (config.deploy.profile.hardware.acs-override) { - kernelPatches = [ - { - name = "acs-patch.patch"; - patch = (pkgs.fetchpatch { - name = "acs-patch.patch"; - url = "https://gitlab.com/Queuecumber/linux-acs-override/-/raw/cc30d83d05019b84468db3ad009bc02ab1bab240/workspaces/5.6.12/acso.patch?inline=false"; - sha256 = "0qjb66ydbqqypyvhhlq8zwry8zcd8609y8d4a0nidhq1g6cp9vcw"; - }); - } - ]; kernelParams = [ "pci=noats" "pcie_acs_override=downstream,multifunction"