Merge pull request #1107 from Lyndeno/nvidia_fix

Treewide: Add Nvidia Architecture
2024-09-19 21:07:23 +02:00 · 2024-09-04 21:22:08 +02:00 · 2024-09-04 21:22:08 +02:00 · 880be1ab83
commit 880be1ab83
parent ace1cedf3e c50dd00a78
26 changed files with 34 additions and 0 deletions
--- a/apple/imac/14-2/default.nix
+++ b/apple/imac/14-2/default.nix
@ -9,6 +9,7 @@
    ../.
    ../../../common/gpu/intel
    ../../../common/gpu/nvidia
+    ../../../common/gpu/nvidia/kepler
    ../../../common/hidpi.nix
  ];

--- a/apple/macbook-pro/10-1/default.nix
+++ b/apple/macbook-pro/10-1/default.nix
@ -5,6 +5,7 @@
    ../.
    ../../../common/pc/laptop/ssd
    ../../../common/gpu/24.05-compat.nix
+    ../../../common/gpu/nvidia/kepler
  ];

  # TODO: reverse compat
--- a/common/gpu/nvidia/kepler/default.nix
+++ b/common/gpu/nvidia/kepler/default.nix
@ -0,0 +1,7 @@
+{lib, ...}:
+{
+  imports = [ ../. ];
+
+  # The open source driver does not support Kepler GPUs.
+  hardware.nvidia.open = false;
+}
--- a/focus/m2/gen1/default.nix
+++ b/focus/m2/gen1/default.nix
@ -4,6 +4,7 @@
  imports = [
    ../../../common/cpu/intel
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/turing
    ../../../common/pc/laptop
    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/laptop/ssd
--- a/lenovo/ideapad/15ach6/default.nix
+++ b/lenovo/ideapad/15ach6/default.nix
@ -6,6 +6,7 @@
    ../../../common/cpu/amd/pstate.nix
    ../../../common/gpu/amd
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/turing
    ../../../common/pc/laptop
    ../../../common/pc/laptop/ssd
  ];
--- a/lenovo/ideapad/15arh05/default.nix
+++ b/lenovo/ideapad/15arh05/default.nix
@ -4,6 +4,7 @@
  imports = [
    ../../../common/cpu/amd
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/turing
    ../../../common/pc/laptop
    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/laptop/ssd
--- a/lenovo/ideapad/16ach6/default.nix
+++ b/lenovo/ideapad/16ach6/default.nix
@ -6,6 +6,7 @@
    ../../../common/cpu/amd/pstate.nix
    ../../../common/gpu/amd
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/turing
    ../../../common/pc/laptop
    ../../../common/pc/laptop/ssd
  ];
--- a/lenovo/legion/15ach6/default.nix
+++ b/lenovo/legion/15ach6/default.nix
@ -4,6 +4,7 @@
    ../../../common/cpu/amd
    ../../../common/gpu/amd
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
    ../../../common/hidpi.nix
    ../../../common/pc/laptop
    ../../../common/pc/laptop/ssd
--- a/lenovo/legion/15ach6h/hybrid/default.nix
+++ b/lenovo/legion/15ach6h/hybrid/default.nix
@ -6,6 +6,7 @@
    ../../../../common/cpu/amd/pstate.nix
    ../../../../common/gpu/amd
    ../../../../common/gpu/nvidia/prime.nix
+    ../../../../common/gpu/nvidia/ampere
    ../../../../common/pc/laptop
    ../../../../common/pc/laptop/ssd
  ];
--- a/lenovo/legion/15ich/default.nix
+++ b/lenovo/legion/15ich/default.nix
@ -4,6 +4,7 @@
  imports = [
    ../../../common/cpu/intel
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/pascal
    ../../../common/pc/laptop
    ../../../common/pc/laptop/ssd
    ../../../common/pc/laptop/hdd
--- a/lenovo/legion/16irx8h/default.nix
+++ b/lenovo/legion/16irx8h/default.nix
@ -6,6 +6,7 @@
  imports = [
    ../../../common/cpu/intel
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ada-lovelace
    ../../../common/pc/laptop
    ../../../common/pc/laptop/ssd
    ../../../common/hidpi.nix
--- a/lenovo/legion/16ithg6/default.nix
+++ b/lenovo/legion/16ithg6/default.nix
@ -4,6 +4,7 @@
  imports = [
    ../../../common/cpu/intel
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
    ../../../common/pc/laptop
    ../../../common/pc/laptop/ssd
    ../../../common/hidpi.nix
--- a/lenovo/legion/t526amr5/default.nix
+++ b/lenovo/legion/t526amr5/default.nix
@ -9,4 +9,7 @@

  # TPM2 module
  security.tpm2.enable = true;
+
+  # Device could have multiple architectures, but they all support open
+  hardware.nvidia.open = true;
 }
--- a/lenovo/thinkpad/e470/default.nix
+++ b/lenovo/thinkpad/e470/default.nix
@ -5,6 +5,7 @@
    ../.
    ../../../common/gpu/intel/kaby-lake
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/maxwell
  ];

  hardware.nvidia.prime = {
--- a/lenovo/thinkpad/p14s/intel/gen3/default.nix
+++ b/lenovo/thinkpad/p14s/intel/gen3/default.nix
@ -4,6 +4,7 @@
  imports = [
    ../.
    ../../../../../common/gpu/nvidia/prime.nix
+    ../../../../../common/gpu/nvidia/turing
  ];

  hardware = {
--- a/lenovo/thinkpad/p50/default.nix
+++ b/lenovo/thinkpad/p50/default.nix
@ -1,6 +1,7 @@
 { lib, config, ... }: {
  imports = [
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/maxwell
    ../../../common/cpu/intel
    ../../../common/pc/laptop/acpi_call.nix
    ../.
--- a/lenovo/thinkpad/p51/default.nix
+++ b/lenovo/thinkpad/p51/default.nix
@ -2,6 +2,7 @@
  imports = [
    ../../../common/gpu/24.05-compat.nix
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/maxwell
    ../../../common/cpu/intel
    ../../../common/gpu/intel/kaby-lake
    ../../../common/pc/laptop/acpi_call.nix
--- a/lenovo/thinkpad/p52/default.nix
+++ b/lenovo/thinkpad/p52/default.nix
@ -2,6 +2,7 @@
  imports = [
    ../../../common/gpu/24.05-compat.nix
    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/pascal
    ../../../common/cpu/intel
    ../../../common/pc/laptop/acpi_call.nix
    ../.
--- a/lenovo/yoga/7/14ARH7/nvidia/default.nix
+++ b/lenovo/yoga/7/14ARH7/nvidia/default.nix
@ -11,6 +11,7 @@ in {
    ## "prime.nix" loads this, aleady:
    # ../../../../common/gpu/nvidia
    ../../../../../common/gpu/nvidia/prime.nix
+    ../../../../../common/gpu/nvidia/ampere
  ];

  # NVIDIA GeForce RTX 3050 Mobile (Ampere)
--- a/msi/gl62/default.nix
+++ b/msi/gl62/default.nix
@ -5,6 +5,7 @@
    ../../common/pc/laptop/ssd
    ../../common/cpu/intel
    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/pascal
    ../../common/pc/laptop
  ];

--- a/omen/14-fb0798ng/default.nix
+++ b/omen/14-fb0798ng/default.nix
@ -4,6 +4,7 @@
  imports = [
    ../../common/cpu/intel
    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/ada-lovelace
    ../../common/pc/laptop
    ../../common/pc/ssd
  ];
--- a/omen/15-en0002np/default.nix
+++ b/omen/15-en0002np/default.nix
@ -5,6 +5,7 @@
    ../../common/cpu/amd
    ../../common/cpu/amd/pstate.nix
    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/turing
    ../../common/pc/laptop
    ../../common/pc/ssd
  ];
--- a/omen/15-en0010ca/default.nix
+++ b/omen/15-en0010ca/default.nix
@ -6,6 +6,7 @@
    ../../common/cpu/amd/pstate.nix
    ../../common/gpu/amd
    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/turing
    ../../common/pc/laptop
    ../../common/pc/ssd
  ];
--- a/omen/15-en1007sa/default.nix
+++ b/omen/15-en1007sa/default.nix
@ -5,6 +5,7 @@
    ../../common/cpu/amd
    ../../common/cpu/amd/pstate.nix
    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/ampere
    ../../common/pc/laptop
    ../../common/pc/ssd
  ];
--- a/omen/16-n0280nd/default.nix
+++ b/omen/16-n0280nd/default.nix
@ -5,6 +5,7 @@
    ../../common/cpu/amd
    ../../common/cpu/amd/pstate.nix
    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/ampere
    ../../common/pc/laptop
    ../../common/pc/ssd
  ];
--- a/system76/gaze18/default.nix
+++ b/system76/gaze18/default.nix
@ -3,6 +3,7 @@
  imports = [
    ../.
    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/ampere
  ];

  boot.initrd.kernelModules = [ "nvidia" ];