diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-19 12:40:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 12:40:03 -0500 |
| commit | ce01740daeaf1288cc973942d80ed8bf69e9d1d1 (patch) | |
| tree | 09af5176df893616b2297a47899ee476a46114c4 /nixos/modules/hardware | |
| parent | ce456559d790b2d1c0e9145193caab550903c7da (diff) | |
| parent | ebf1dade82911ad4e0d88cf09ad4feb5819549d5 (diff) | |
| download | nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.gz nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.bz2 nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.lz nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.xz nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.zst nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.zip | |
Merge pull request #33685 from corngood/amdgpu-pro-upgrade
amdgpu-pro: 17.10 -> 17.40
Diffstat (limited to 'nixos/modules/hardware')
| -rw-r--r-- | nixos/modules/hardware/video/amdgpu-pro.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 5cc96d8bd074..50af022b93c8 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -15,13 +15,19 @@ let opengl = config.hardware.opengl; + kernel = pkgs.linux_4_9.override { + extraConfig = '' + KALLSYMS_ALL y + ''; + }; + in { config = mkIf enabled { - nixpkgs.config.xorg.abiCompat = "1.18"; + nixpkgs.config.xorg.abiCompat = "1.19"; services.xserver.drivers = singleton { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; }; @@ -31,6 +37,9 @@ in boot.extraModulePackages = [ package ]; + boot.kernelPackages = + pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor kernel); + boot.blacklistedKernelModules = [ "radeon" ]; hardware.firmware = [ package ]; @@ -38,10 +47,15 @@ in system.activationScripts.setup-amdgpu-pro = '' mkdir -p /run/lib ln -sfn ${package}/lib ${package.libCompatDir} + ln -sfn ${package} /run/amdgpu-pro '' + optionalString opengl.driSupport32Bit '' ln -sfn ${package32}/lib ${package32.libCompatDir} ''; + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "KALLSYMS_ALL") + ]; + environment.etc = { "amd/amdrc".source = package + "/etc/amd/amdrc"; "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; |