From 48b7c1c7828af8a86d4faadbb7d878ed80647c8b Mon Sep 17 00:00:00 2001
From: Daniel Ebbert <debbert@uni-koeln.de>
Date: Wed, 1 Sep 2021 09:34:21 +0200
Subject: [PATCH] Update E14 AMD

---
 lenovo/thinkpad/e14/amd/default.nix | 11 ++++-------
 lenovo/thinkpad/e14/default.nix     |  1 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lenovo/thinkpad/e14/amd/default.nix b/lenovo/thinkpad/e14/amd/default.nix
index c2d1534..d39c7d9 100644
--- a/lenovo/thinkpad/e14/amd/default.nix
+++ b/lenovo/thinkpad/e14/amd/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ../.
     ../../../../common/cpu/amd
+    ../../../../common/gpu/amd
   ];
 
   boot.kernelParams = [
@@ -11,13 +12,9 @@
     # either crashes or is not able to attach to the GPU depending on
     # the kernel version. I've seen no issues with the IOMMU disabled.
     #
-    # BIOS version 1.13 claims to fix IOMMU issues, but we leave the
-    # IOMMU off to avoid a sad experience for those people that drew
+    # BIOS version 1.13 fixes the IOMMU issues, but we leave the IOMMU
+    # in software mode to avoid a sad experience for those people that drew
     # the short straw when they bought their laptop.
-    "iommu=off"
+    "iommu=soft"
   ];
-
-  # As of writing this, Linux 5.8 is the oldest kernel that is still
-  # supported and has decent Renoir support.
-  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.8") pkgs.linuxPackages_latest;
 }
diff --git a/lenovo/thinkpad/e14/default.nix b/lenovo/thinkpad/e14/default.nix
index e014b7d..42bf014 100644
--- a/lenovo/thinkpad/e14/default.nix
+++ b/lenovo/thinkpad/e14/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../.
+    ../../../common/pc/laptop/ssd
     ../../../common/pc/laptop/acpi_call.nix
   ];