about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-05-18 15:05:52 +0200
committerGitHub <noreply@github.com>2020-05-18 15:05:52 +0200
commit5621b50c73e3f85090414cce05f47d256735ac28 (patch)
tree81062f976fe21abca7130e814dc991a3a995b657 /pkgs
parentc29124b67c7b8ccc31e1b5042713ff562e0903cf (diff)
parent2b5d59cbdc86731f0f4c85a9c21e1498e61e8bd5 (diff)
downloadnixlib-5621b50c73e3f85090414cce05f47d256735ac28.tar
nixlib-5621b50c73e3f85090414cce05f47d256735ac28.tar.gz
nixlib-5621b50c73e3f85090414cce05f47d256735ac28.tar.bz2
nixlib-5621b50c73e3f85090414cce05f47d256735ac28.tar.lz
nixlib-5621b50c73e3f85090414cce05f47d256735ac28.tar.xz
nixlib-5621b50c73e3f85090414cce05f47d256735ac28.tar.zst
nixlib-5621b50c73e3f85090414cce05f47d256735ac28.zip
Merge pull request #88026 from puckipedia/linux-deferred-takeover
linux: Enable fbcon deferred takeover when possible
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 636d174b1551..c715c7baf787 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -219,6 +219,7 @@ let
       FB_3DFX_ACCEL       = yes;
       FB_VESA             = yes;
       FRAMEBUFFER_CONSOLE = yes;
+      FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes;
       FRAMEBUFFER_CONSOLE_ROTATION = yes;
       FB_GEODE            = mkIf (stdenv.hostPlatform.system == "i686-linux") yes;
     };