Merge pull request #142015 from jkarlson/simplefb

linux: FB_SIMPLE
2021-10-21 13:47:49 -04:00 · 2021-10-21 13:47:49 -04:00 · 16a55a22a5
parent 78c584e0c0 2ef28fb77d
commit 16a55a22a5
1 changed files with 2 additions and 0 deletions
--- 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 = {