From a1a8723bf9786436f0f784736a5c1e55c7e330b0 Mon Sep 17 00:00:00 2001 From: ChaosAttractor <46527539+LostAttractor@users.noreply.github.com> Date: Fri, 16 Dec 2022 05:01:50 +0800 Subject: [PATCH] Add a option to add(or disadd) amdgpu to kernelModule Add a option to add(or disadd) amdgpu to boot.initrd.kernelModule --- common/gpu/amd/default.nix | 46 ++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/common/gpu/amd/default.nix b/common/gpu/amd/default.nix index 762b3c0..91ba0b7 100644 --- a/common/gpu/amd/default.nix +++ b/common/gpu/amd/default.nix @@ -1,23 +1,35 @@ { config, lib, pkgs, ... }: { - boot.initrd.kernelModules = [ "amdgpu" ]; - services.xserver.videoDrivers = [ "amdgpu" ]; - - hardware.opengl.extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime - amdvlk - ]; - - hardware.opengl.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; - - hardware.opengl = { - driSupport = lib.mkDefault true; - driSupport32Bit = lib.mkDefault true; + options.hardware.amdgpu.loadInInitrd = lib.mkEnableOption (lib.mdDoc + "loading `amdgpu` kernelModule at stage 1. (Add `amdgpu` to `boot.initrd.kernelModules`)" + ) // { + default = true; }; - environment.variables.AMD_VULKAN_ICD = lib.mkDefault "RADV"; + config = lib.mkMerge [ + { + services.xserver.videoDrivers = lib.mkDefault [ "amdgpu" ]; + + hardware.opengl.extraPackages = with pkgs; [ + rocm-opencl-icd + rocm-opencl-runtime + amdvlk + ]; + + hardware.opengl.extraPackages32 = with pkgs; [ + driversi686Linux.amdvlk + ]; + + hardware.opengl = { + driSupport = lib.mkDefault true; + driSupport32Bit = lib.mkDefault true; + }; + + environment.variables.AMD_VULKAN_ICD = lib.mkDefault "RADV"; + } + (lib.mkIf config.hardware.amdgpu.loadInInitrd { + boot.initrd.kernelModules = [ "amdgpu" ]; + }) + ]; }