From 467f768581c095f9328bf00265a43b0f7a941fc4 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Sun, 10 Nov 2024 10:39:09 +0100 Subject: [PATCH 1/2] framework: workaround display issues on AMD GPUs --- framework/13-inch/common/amd.nix | 13 +++++++++++-- framework/16-inch/common/amd.nix | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/framework/13-inch/common/amd.nix b/framework/13-inch/common/amd.nix index f5341b638..20d9d2357 100644 --- a/framework/13-inch/common/amd.nix +++ b/framework/13-inch/common/amd.nix @@ -5,8 +5,17 @@ ../../../common/gpu/amd ]; - # Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/ - boot.kernelParams = lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") ["rtc_cmos.use_acpi_alarm=1"] ; + boot.kernelParams = + [ + # There seems to be an issue with panel self-refresh (PSR) that + # causes hangs for users. + # + # https://community.frame.work/t/fedora-kde-becomes-suddenly-slow/58459 + # https://gitlab.freedesktop.org/drm/amd/-/issues/3647 + "amdgpu.dcdebugmask=0x10" + ] + # Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/ + ++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") ["rtc_cmos.use_acpi_alarm=1"]; # AMD has better battery life with PPD over TLP: # https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13 diff --git a/framework/16-inch/common/amd.nix b/framework/16-inch/common/amd.nix index f5341b638..20d9d2357 100644 --- a/framework/16-inch/common/amd.nix +++ b/framework/16-inch/common/amd.nix @@ -5,8 +5,17 @@ ../../../common/gpu/amd ]; - # Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/ - boot.kernelParams = lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") ["rtc_cmos.use_acpi_alarm=1"] ; + boot.kernelParams = + [ + # There seems to be an issue with panel self-refresh (PSR) that + # causes hangs for users. + # + # https://community.frame.work/t/fedora-kde-becomes-suddenly-slow/58459 + # https://gitlab.freedesktop.org/drm/amd/-/issues/3647 + "amdgpu.dcdebugmask=0x10" + ] + # Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/ + ++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") ["rtc_cmos.use_acpi_alarm=1"]; # AMD has better battery life with PPD over TLP: # https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13 From 522a9e837835238a53e328bf749ddb1059f39c56 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Sun, 10 Nov 2024 15:32:21 +0800 Subject: [PATCH 2/2] apple/t2: bump kernel from 6.11 to 6.11.7 --- apple/t2/pkgs/linux-t2.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apple/t2/pkgs/linux-t2.nix b/apple/t2/pkgs/linux-t2.nix index 4cf37d4a6..54d6e237f 100644 --- a/apple/t2/pkgs/linux-t2.nix +++ b/apple/t2/pkgs/linux-t2.nix @@ -2,19 +2,19 @@ , ... } @ args: let - version = "6.11"; + version = "6.11.7"; majorVersion = with lib; (elemAt (take 1 (splitVersion version)) 0); patchRepo = fetchFromGitHub { owner = "t2linux"; repo = "linux-t2-patches"; - rev = "54b4f914930d92cf0b94601b402ec93f54a76390"; - hash = "sha256-mpGWcx+zE5kb5USE4CPGrrleZRNGxVUGxc9eQY5IIfY="; + rev = "ec4545c603cf2ef315818eccce62d06ee18e5c60"; + hash = "sha256-Nm7WiLjotwk5NDrpKTgcKtyQTOUG7A88ZgtzD460qY0="; }; kernel = fetchzip { url = "mirror://kernel/linux/kernel/v${majorVersion}.x/linux-${version}.tar.xz"; - hash = "sha256-QIbHTLWI5CaStQmuoJ1k7odQUDRLsWNGY10ek0eKo8M="; + hash = "sha256-wHWd8xfEFOTy0FkFBtn30+6816XC4uhgn0G9b40n9Co="; }; in buildLinux (args // {