From 2ef28fb77d9f307a152468106be26204e22dd325 Mon Sep 17 00:00:00 2001 From: Emil Karlson Date: Sun, 17 Oct 2021 20:06:35 +0300 Subject: [PATCH] linux: do not build in DRM_SIMPLEDRM on newer kernels After linux 5.14.11 FB_SIMPLE conflicts with DRM_SIMPLEDRM, which will fail configuration, when DRM_SIMPLEDRM is configured as a module and FB_SIMPLE gets requested as builtin. Do not enable DRM_SIMPLEDRM as a temporary workaround, until good enough migration path is found. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 717fdaee72a5..019a8698c088 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -246,6 +246,8 @@ let FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; + # On 5.14 this conflicts with FB_SIMPLE. + DRM_SIMPLEDRM = whenAtLeast "5.14" no; }; video = {