Merge pull request #1756 from soumyadeep70/vpl-gpu-rt-fix
common/gpu/intel: avoid enabling OneVPL runtime by default on pre-TGL GPUs
This commit is contained in:
commit
b794c1fc56
1 changed files with 16 additions and 3 deletions
|
|
@ -22,7 +22,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
computeRuntime = lib.mkOption {
|
computeRuntime = lib.mkOption {
|
||||||
description = "intel-compute-runtime variant to use";
|
description = "intel-compute-runtime variant to use (legacy for Gen8–11, default for Gen12+)";
|
||||||
type = lib.types.enum [
|
type = lib.types.enum [
|
||||||
"default"
|
"default"
|
||||||
"legacy"
|
"legacy"
|
||||||
|
|
@ -30,6 +30,15 @@
|
||||||
default = "default";
|
default = "default";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mediaRuntime = lib.mkOption {
|
||||||
|
description = "Intel media runtime to use (Media SDK for Gen8–11, OneVPL for Gen12+)";
|
||||||
|
type = lib.types.enum [
|
||||||
|
"vpl-gpu-rt"
|
||||||
|
"intel-media-sdk"
|
||||||
|
];
|
||||||
|
default = "vpl-gpu-rt";
|
||||||
|
};
|
||||||
|
|
||||||
vaapiDriver = lib.mkOption {
|
vaapiDriver = lib.mkOption {
|
||||||
description = "Intel VAAPI driver to use (use null to use both)";
|
description = "Intel VAAPI driver to use (use null to use both)";
|
||||||
type = lib.types.nullOr (
|
type = lib.types.nullOr (
|
||||||
|
|
@ -71,7 +80,11 @@
|
||||||
pkgs.intel-compute-runtime-legacy1
|
pkgs.intel-compute-runtime-legacy1
|
||||||
else
|
else
|
||||||
pkgs.intel-compute-runtime;
|
pkgs.intel-compute-runtime;
|
||||||
vpl-gpu-rt = pkgs.vpl-gpu-rt or pkgs.onevpl-intel-gpu;
|
intel-media-runtime =
|
||||||
|
if cfg.mediaRuntime == "vpl-gpu-rt" then
|
||||||
|
pkgs.vpl-gpu-rt or pkgs.onevpl-intel-gpu
|
||||||
|
else
|
||||||
|
pkgs.intel-media-sdk;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
boot.initrd.kernelModules = lib.optionals cfg.loadInInitrd [ cfg.driver ];
|
boot.initrd.kernelModules = lib.optionals cfg.loadInInitrd [ cfg.driver ];
|
||||||
|
|
@ -82,7 +95,7 @@
|
||||||
++ lib.optionals useIntelMediaDriver [
|
++ lib.optionals useIntelMediaDriver [
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
intel-compute-runtime
|
intel-compute-runtime
|
||||||
vpl-gpu-rt
|
intel-media-runtime
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.graphics.extraPackages32 =
|
hardware.graphics.extraPackages32 =
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue