1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-01 08:39:41 +01:00

Merge pull request #1197 from NixOS/lunar-lake

common/gpu/intel/lunar-lake: enable xe driver
This commit is contained in:
Jörg Thalheim 2024-10-22 21:14:45 +02:00 committed by GitHub
commit 22e8de2729
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 40 additions and 21 deletions

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/braswell ../../../gpu/intel/braswell
]; ];
} }

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/broadwell ../../../gpu/intel/broadwell
]; ];
} }

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/comet-lake ../../../gpu/intel/comet-lake
]; ];
} }

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/elkhart-lake ../../../gpu/intel/elkhart-lake
]; ];
} }

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/haswell ../../../gpu/intel/haswell
]; ];
} }

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/jasper-lake ../../../gpu/intel/jasper-lake
]; ];
} }

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/kaby-lake ../../../gpu/intel/kaby-lake
]; ];
} }

View file

@ -0,0 +1,5 @@
{
imports = [
../cpu-only.nix
];
}

View file

@ -0,0 +1,6 @@
{
imports = [
./cpu-only.nix
../../../gpu/intel/lunar-lake
];
}

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/sandy-bridge ../../../gpu/intel/sandy-bridge
]; ];
} }

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../cpu-only.nix ./cpu-only.nix
../../../gpu/intel/tiger-lake ../../../gpu/intel/tiger-lake
]; ];
} }

View file

@ -0,0 +1,8 @@
{ config, lib, ... }:
{
imports = [ ../. ];
hardware.intelgpu = {
driver = lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8") "xe";
vaapiDriver = "intel-media-driver";
};
}

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726153070, "lastModified": 1727826117,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726905744, "lastModified": 1729455275,
"narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=", "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381", "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,11 +37,11 @@
}, },
"nixos-stable": { "nixos-stable": {
"locked": { "locked": {
"lastModified": 1726838390, "lastModified": 1729307008,
"narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,11 +53,11 @@
}, },
"nixos-unstable-small": { "nixos-unstable-small": {
"locked": { "locked": {
"lastModified": 1726885390, "lastModified": 1729493358,
"narHash": "sha256-NPoqPAA2z9o/Syyx4M4v3/e6ROkK21enXx4+29Q45uc=", "narHash": "sha256-Ti+Y9nWt5Fcs3JlarxLPgIOVlbqQo7jobz/qOwOaziM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f7bfe794a79c69c01f2dce20fb7b287ae98a96eb", "rev": "a5e6a9e979367ee14f65d9c38119c30272f8455f",
"type": "github" "type": "github"
}, },
"original": { "original": {