diff options
| author | Krzysztof Nazarewski <gpg@kdn.im> | 2024-06-06 09:46:34 +0200 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-07-18 16:57:18 +0300 |
| commit | 7c3815ab71cf6819c0aefb7eba4b4f2be2e85997 (patch) | |
| tree | 4358cf7a57a5fa313f316c08e68253c27ef99b20 | |
| parent | makeModulesClosure: include /lib/firmware/edid (diff) | |
| download | nixpkgs-7c3815ab71cf6819c0aefb7eba4b4f2be2e85997.tar.gz | |
kernel: fix EDID firmware loading
for context:
- https://github.com/NixOS/nixpkgs/pull/279789#discussion_r1624936659
- https://github.com/NixOS/nixpkgs/pull/279789#issuecomment-2148560802
- https://github.com/NixOS/nixpkgs/pull/279789#issuecomment-2150726766
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e4d8706fb6a6..af4158fc5710 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1147,6 +1147,8 @@ let # For systemd-binfmt BINFMT_MISC = option yes; + # Required for EDID overriding + FW_LOADER = yes; # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK = option no; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5981de673242..74e603623412 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -219,7 +219,7 @@ let config = { CONFIG_MODULES = "y"; - CONFIG_FW_LOADER = "m"; + CONFIG_FW_LOADER = "y"; CONFIG_RUST = if withRust then "y" else "n"; }; }); |