From 8cad7aa618fbf6bf7b62b342b836a50b80d8b679 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Thu, 26 Mar 2026 19:43:10 -0700
Subject: [PATCH] linux kernel: 6.19.9 -> 7.0-rc4

---
 system/common.nix       | 6 ++----
 system/system-mreow.nix | 6 ------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/system/common.nix b/system/common.nix
index fd05c5f..d6f97ed 100644
--- a/system/common.nix
+++ b/system/common.nix
@@ -86,8 +86,8 @@
 
   # kernel options
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
-    # kernelPackages = pkgs.linuxPackages;
+    kernelPackages = pkgs.linuxPackages_testing;
+    # kernelPackages = pkgs.linuxPackages_latest;
 
     lanzaboote = {
       enable = true;
@@ -135,8 +135,6 @@
       "hugepagesz=1G"
       "hugepages=3"
 
-      # disable compute wave store and resume — workaround for amdgpu MES hangs/freezes
-      "amdgpu.cwsr_enable=0"
     ];
 
   };
diff --git a/system/system-mreow.nix b/system/system-mreow.nix
index aadfc75..ecfc6ad 100644
--- a/system/system-mreow.nix
+++ b/system/system-mreow.nix
@@ -14,12 +14,6 @@
     inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
   ];
 
-  # Disable PSR, PSR-SU, and Panel Replay to fix display hangs and corruption.
-  # Panel Replay requires PSR/PSR-SU to also be disabled to avoid issues.
-  # This overrides nixos-hardware's 0x10 with 0x410 (last value wins in kernel cmdline).
-  # https://github.com/NixOS/nixos-hardware/pull/1692
-  boot.kernelParams = lib.mkAfter [ "amdgpu.dcdebugmask=0x410" ];
-
   hardware.framework.laptop13.audioEnhancement.rawDeviceName =
     lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo";