From 536ac3ab4b6cf09aa4a831b25ce4fea94ae79740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Sep 2025 23:56:14 +0200 Subject: [PATCH 1/4] common/cpu/intel/comet-lake: drop gpu option It is already set for the gpu --- common/cpu/intel/comet-lake/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/cpu/intel/comet-lake/default.nix b/common/cpu/intel/comet-lake/default.nix index 25af65fe..3c688f50 100644 --- a/common/cpu/intel/comet-lake/default.nix +++ b/common/cpu/intel/comet-lake/default.nix @@ -3,6 +3,4 @@ ./cpu-only.nix ../../../gpu/intel/comet-lake ]; - - hardware.intelgpu.vaapiDriver = "intel-media-driver"; } From a98f1a2b75cf5fc934db11a8818e266360234238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Sep 2025 23:56:36 +0200 Subject: [PATCH 2/4] Drop some unused inputs --- common/gpu/intel/broadwell/default.nix | 2 -- common/gpu/intel/skylake/default.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/common/gpu/intel/broadwell/default.nix b/common/gpu/intel/broadwell/default.nix index 0b19cb78..6412c671 100644 --- a/common/gpu/intel/broadwell/default.nix +++ b/common/gpu/intel/broadwell/default.nix @@ -1,5 +1,3 @@ -{ lib, pkgs, ... }: - { imports = [ ../. ]; diff --git a/common/gpu/intel/skylake/default.nix b/common/gpu/intel/skylake/default.nix index e9c24279..7dd5a921 100644 --- a/common/gpu/intel/skylake/default.nix +++ b/common/gpu/intel/skylake/default.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { imports = [ ../. ]; From 4100cffdbee7980e18ab013dd709d155acec767d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Sep 2025 23:57:40 +0200 Subject: [PATCH 3/4] common/gpu: add option to choose intel-compute-runtime variant --- common/gpu/intel/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/common/gpu/intel/default.nix b/common/gpu/intel/default.nix index a8671d41..0c5e346b 100644 --- a/common/gpu/intel/default.nix +++ b/common/gpu/intel/default.nix @@ -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 ( @@ -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 { From e049c10c3e9f9e48e6f984c7993c7bd447395fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Sep 2025 23:58:40 +0200 Subject: [PATCH 4/4] treewide: set intel cpu variant to legacy where newer versions are not supported According to https://github.com/intel/compute-runtime#legacy-platforms --- common/gpu/intel/broadwell/default.nix | 1 + common/gpu/intel/coffee-lake/default.nix | 5 ++++- common/gpu/intel/comet-lake/default.nix | 5 ++++- common/gpu/intel/elkhart-lake/default.nix | 5 ++++- common/gpu/intel/kaby-lake/default.nix | 5 ++++- common/gpu/intel/skylake/default.nix | 1 + 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/common/gpu/intel/broadwell/default.nix b/common/gpu/intel/broadwell/default.nix index 6412c671..eb4d1cdf 100644 --- a/common/gpu/intel/broadwell/default.nix +++ b/common/gpu/intel/broadwell/default.nix @@ -2,6 +2,7 @@ imports = [ ../. ]; hardware.intelgpu = { + computeRuntime = "legacy"; vaapiDriver = "intel-vaapi-driver"; enableHybridCodec = true; }; diff --git a/common/gpu/intel/coffee-lake/default.nix b/common/gpu/intel/coffee-lake/default.nix index 55e71d21..49c683d8 100644 --- a/common/gpu/intel/coffee-lake/default.nix +++ b/common/gpu/intel/coffee-lake/default.nix @@ -7,5 +7,8 @@ "i915.enable_guc=2" ]; - hardware.intelgpu.vaapiDriver = "intel-media-driver"; + hardware.intelgpu = { + computeRuntime = "legacy"; + vaapiDriver = "intel-media-driver"; + }; } diff --git a/common/gpu/intel/comet-lake/default.nix b/common/gpu/intel/comet-lake/default.nix index 43ed1c46..200e34a3 100644 --- a/common/gpu/intel/comet-lake/default.nix +++ b/common/gpu/intel/comet-lake/default.nix @@ -3,5 +3,8 @@ boot.kernelParams = [ "i915.enable_guc=2" ]; - hardware.intelgpu.vaapiDriver = "intel-media-driver"; + hardware.intelgpu = { + computeRuntime = "legacy"; + vaapiDriver = "intel-media-driver"; + }; } diff --git a/common/gpu/intel/elkhart-lake/default.nix b/common/gpu/intel/elkhart-lake/default.nix index 43ed1c46..200e34a3 100644 --- a/common/gpu/intel/elkhart-lake/default.nix +++ b/common/gpu/intel/elkhart-lake/default.nix @@ -3,5 +3,8 @@ boot.kernelParams = [ "i915.enable_guc=2" ]; - hardware.intelgpu.vaapiDriver = "intel-media-driver"; + hardware.intelgpu = { + computeRuntime = "legacy"; + vaapiDriver = "intel-media-driver"; + }; } diff --git a/common/gpu/intel/kaby-lake/default.nix b/common/gpu/intel/kaby-lake/default.nix index a8386691..37a639d8 100644 --- a/common/gpu/intel/kaby-lake/default.nix +++ b/common/gpu/intel/kaby-lake/default.nix @@ -7,5 +7,8 @@ "i915.enable_psr=2" ]; - hardware.intelgpu.vaapiDriver = "intel-media-driver"; + hardware.intelgpu = { + computeRuntime = "legacy"; + vaapiDriver = "intel-media-driver"; + }; } diff --git a/common/gpu/intel/skylake/default.nix b/common/gpu/intel/skylake/default.nix index 7dd5a921..553cc836 100644 --- a/common/gpu/intel/skylake/default.nix +++ b/common/gpu/intel/skylake/default.nix @@ -10,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; };