Skip to content

common/gpu: add and use option to choose intel-compute-runtime variant #1609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 13, 2025
Merged

common/gpu: add and use option to choose intel-compute-runtime variant #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
536ac3a
common/cpu/intel/comet-lake: drop gpu option
SuperSandro2000 Sep 11, 2025
a98f1a2
Drop some unused inputs
SuperSandro2000 Sep 11, 2025
4100cff
common/gpu: add option to choose intel-compute-runtime variant
SuperSandro2000 Sep 11, 2025
e049c10
treewide: set intel cpu variant to legacy where newer versions are no…
SuperSandro2000 Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions common/cpu/intel/comet-lake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@
./cpu-only.nix
../../../gpu/intel/comet-lake
];

hardware.intelgpu.vaapiDriver = "intel-media-driver";
}
3 changes: 1 addition & 2 deletions common/gpu/intel/broadwell/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{ lib, pkgs, ... }:

{
imports = [ ../. ];

hardware.intelgpu = {
computeRuntime = "legacy";
vaapiDriver = "intel-vaapi-driver";
enableHybridCodec = true;
};
Expand Down
5 changes: 4 additions & 1 deletion common/gpu/intel/coffee-lake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
"i915.enable_guc=2"
];

hardware.intelgpu.vaapiDriver = "intel-media-driver";
hardware.intelgpu = {
computeRuntime = "legacy";
vaapiDriver = "intel-media-driver";
};
}
5 changes: 4 additions & 1 deletion common/gpu/intel/comet-lake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@

boot.kernelParams = [ "i915.enable_guc=2" ];

hardware.intelgpu.vaapiDriver = "intel-media-driver";
hardware.intelgpu = {
computeRuntime = "legacy";
vaapiDriver = "intel-media-driver";
};
}
15 changes: 14 additions & 1 deletion common/gpu/intel/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
default = true;
};

computeRuntime = lib.mkOption {
description = "intel-compute-runtime variant to use";
type = lib.types.enum [
"default"
"legacy"
];
default = "default";
};

vaapiDriver = lib.mkOption {
description = "Intel VAAPI driver to use (use null to use both)";
type = lib.types.nullOr (
Expand Down Expand Up @@ -59,7 +68,11 @@
useIntelMediaDriver = cfg.vaapiDriver == "intel-media-driver" || cfg.vaapiDriver == null;
intel-media-driver = pkgs.intel-media-driver;
intel-media-driver-32 = pkgs.driversi686Linux.intel-media-driver;
intel-compute-runtime = pkgs.intel-compute-runtime;
intel-compute-runtime =
if cfg.computeRuntime == "legacy" then
pkgs.intel-compute-runtime-legacy1
else
pkgs.intel-compute-runtime;
vpl-gpu-rt = pkgs.vpl-gpu-rt or pkgs.onevpl-intel-gpu;
in
{
Expand Down
5 changes: 4 additions & 1 deletion common/gpu/intel/elkhart-lake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@

boot.kernelParams = [ "i915.enable_guc=2" ];

hardware.intelgpu.vaapiDriver = "intel-media-driver";
hardware.intelgpu = {
computeRuntime = "legacy";
vaapiDriver = "intel-media-driver";
};
}
5 changes: 4 additions & 1 deletion common/gpu/intel/kaby-lake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
"i915.enable_psr=2"
];

hardware.intelgpu.vaapiDriver = "intel-media-driver";
hardware.intelgpu = {
computeRuntime = "legacy";
vaapiDriver = "intel-media-driver";
};
}
3 changes: 1 addition & 2 deletions common/gpu/intel/skylake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{ pkgs, ... }:

{
imports = [ ../. ];

Expand All @@ -12,6 +10,7 @@
# NixOS Wiki recommends using the legacy intel-vaapi-driver with the hybrid codec over that one for Skylake.
# https://wiki.nixos.org/wiki/Accelerated_Video_Playback
hardware.intelgpu = {
computeRuntime = "legacy";
vaapiDriver = "intel-vaapi-driver";
enableHybridCodec = true;
};
Expand Down