eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-30 06:49:43 +01:00
Code Issues Releases Wiki Activity

common/gpu/intel: reformat

Browse source
This commit is contained in:
Gavin John 2024-10-18 12:38:51 -07:00 committed by mergify[bot]
parent 3827903417
commit 0ccdd27056
5 changed files with 54 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/gpu/intel/comet-lake/default.nix
View file

@ -1,7 +1,5 @@
{ {
imports = [ ../. ]; imports = [ ../. ];
boot.kernelParams = [ boot.kernelParams = [ "i915.enable_guc=2" ];
"i915.enable_guc=2"
];
} }

20
common/gpu/intel/default.nix
View file

@ -6,7 +6,9 @@
}: }:
{ {
imports = [ ../24.05-compat.nix ]; imports = [ ../24.05-compat.nix ];
options.hardware.intelgpu.driver = lib.mkOption {
options.hardware.intelgpu = {
driver = lib.mkOption {
description = "Intel GPU driver to use"; description = "Intel GPU driver to use";
type = lib.types.enum [ type = lib.types.enum [
"i915" "i915"
@ -15,16 +17,19 @@
default = "i915"; default = "i915";
}; };
options.hardware.intelgpu.loadInInitrd = loadInInitrd =
lib.mkEnableOption "Load the Intel GPU kernel module at stage 1 boot. (Added to `boot.initrd.kernelModules`)" lib.mkEnableOption "Load the Intel GPU kernel module at stage 1 boot. (Added to `boot.initrd.kernelModules`)"
// { // {
default = true; default = true;
}; };
};
config = { config =
boot.initrd.kernelModules = lib.optionals config.hardware.intelgpu.loadInInitrd [ let
config.hardware.intelgpu.driver cfg = config.hardware.intelgpu;
]; in
{
boot.initrd.kernelModules = lib.optionals cfg.loadInInitrd [ cfg.driver ];
hardware.graphics.extraPackages = with pkgs; [ hardware.graphics.extraPackages = with pkgs; [
( (
@ -49,8 +54,7 @@
assertions = [ assertions = [
{ {
assertion = ( assertion = (
config.hardware.intelgpu.driver != "xe" cfg.driver != "xe" || lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8"
|| lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8"
); );
message = "Intel Xe GPU driver is not supported on kernels earlier than 6.8. Update or use the i915 driver."; message = "Intel Xe GPU driver is not supported on kernels earlier than 6.8. Update or use the i915 driver.";
} }

4
common/gpu/intel/elkhart-lake/default.nix
View file

@ -1,7 +1,5 @@
{ {
imports = [ ../. ]; imports = [ ../. ];
boot.kernelParams = [ boot.kernelParams = [ "i915.enable_guc=2" ];
"i915.enable_guc=2"
];
} }

4
common/gpu/intel/jasper-lake/default.nix
View file

@ -1,7 +1,5 @@
{ {
imports = [ ../. ]; imports = [ ../. ];
boot.kernelParams = [ boot.kernelParams = [ "i915.enable_guc=2" ];
"i915.enable_guc=2"
];
} }

4
common/gpu/intel/sandy-bridge/default.nix
View file

@ -3,7 +3,5 @@
# Enables RC6, RC6p and RC6pp. # Enables RC6, RC6p and RC6pp.
# Last two are only available on Sandy Bridge CPUs (circa 2011). # Last two are only available on Sandy Bridge CPUs (circa 2011).
boot.kernelParams = [ boot.kernelParams = [ "i915.enable_rc6=7" ];
"i915.enable_rc6=7"
];
} }