framenix: use targeted patch instead of reverts

This commit is contained in:
Trolli Schmittlauch 2024-02-09 00:05:31 +01:00
parent 7ec8fa2d44
commit a18b8a685e
2 changed files with 50 additions and 25 deletions

View file

@ -33,31 +33,9 @@ in
# revert some commits that introduced the clourful graphics artefacts flickering,
# at least that's the current working hypothesis in https://gitlab.freedesktop.org/drm/amd/-/issues/3097
boot.kernelPatches = [
{name = "revert 9ae587f850a6702428273fcf4a2a9b392349b2a3";
patch = (pkgs.fetchpatch {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=9ae587f850a6702428273fcf4a2a9b392349b2a3";
hash = "sha256-5Uu8zxRSQuqE8oymjwPMt/ylsItpkQVDhbrOSMj8g3I=";
revert = true;
});}
{name = "revert 2eb412aa25ed2bf59f5ad5f7a09787d182d67934";
patch = (pkgs.fetchpatch {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=2eb412aa25ed2bf59f5ad5f7a09787d182d67934";
hash = "sha256-VtsH6bmwaLxPZ+uXvVE6qVWD2/aIKf9GLuMTNKq6d8M=";
revert = true;
});}
{name = "revert 0a1844bf0b532d84324453374ad6845f64066c28";
patch = (pkgs.fetchpatch {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=0a1844bf0b532d84324453374ad6845f64066c28";
hash = "sha256-Zd2pcYiOmuuzcc7THNtJW/YTjPyzO7HmQYKJNzy9YPw=";
revert = true;
});
# alternatively, 8569c3154538 can be reverted as well
extraStructuredConfig = with lib.kernel; {
DRM_I915 = no;
DRM_I915_GVT = lib.mkForce unset;
DRM_I915_GVT_KVMGT = lib.mkForce unset;
};
}
{name = "patch attempt from https://gitlab.freedesktop.org/drm/amd/-/issues/3097#note_2271482";
patch = ./0001-drm-buddy-Improve-alloc_range-error-handling-routine.patch;
}
];
# temporary workaround for white flickering graphics artefacts