diff options
| author | André Vitor de Lima Matos <andre.vmatos@gmail.com> | 2023-11-01 11:58:54 -0300 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-02 13:38:15 +0100 |
| commit | e00c606455cef66797d48b3a145e913b509a4077 (patch) | |
| tree | 5b8b27443a47d2556bcffd23b16338a2fd57ff7e | |
| parent | 95acdf3422940b563dfeb979cef444979abfd4b9 (diff) | |
| download | nixpkgs-e00c606455cef66797d48b3a145e913b509a4077.tar nixpkgs-e00c606455cef66797d48b3a145e913b509a4077.tar.gz nixpkgs-e00c606455cef66797d48b3a145e913b509a4077.tar.bz2 nixpkgs-e00c606455cef66797d48b3a145e913b509a4077.tar.lz nixpkgs-e00c606455cef66797d48b3a145e913b509a4077.tar.xz nixpkgs-e00c606455cef66797d48b3a145e913b509a4077.tar.zst nixpkgs-e00c606455cef66797d48b3a145e913b509a4077.zip | |
kernel: fix framebuffer console after 6.6
These options were already enabled in previous versions, but Kconfig changes in 6.6 made NixOS kernel disable them. Therefore, we enable unconditionally, to be explicit that they're needed. Without them, the fbcon/console on systems with DRM devices freeze/blank on early boot, even though the system boots normally.
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0f59d3ac7aa..4e366a87d09 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -320,9 +320,11 @@ let FRAMEBUFFER_CONSOLE = yes; FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; + FRAMEBUFFER_CONSOLE_DETECT_PRIMARY = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; # On 5.14 this conflicts with FB_SIMPLE. DRM_SIMPLEDRM = whenAtLeast "5.14" no; + DRM_FBDEV_EMULATION = yes; }; fonts = { |