diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 8bbf8e2..29bf28c 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -37,13 +37,6 @@ in # hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; # environment.variables = { AMD_VULKAN_ICD = "RADV"; }; - boot.extraModulePackages = [ - ((pkgs.amdgpu-kernel-module.override { - kernel = config.boot.kernelPackages.kernel; - }).overrideAttrs (_: { - patches = [ ../patches/kernel/amdgpu-disable-shutdown-on-overheating.diff ]; - })) - ]; fileSystems."/" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; diff --git a/patches/kernel/amdgpu-disable-shutdown-on-overheating.diff b/patches/kernel/amdgpu-disable-shutdown-on-overheating.diff deleted file mode 100644 index 05908c3..0000000 --- a/patches/kernel/amdgpu-disable-shutdown-on-overheating.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c -index bfe80ac0a..5343b8b86 100644 ---- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c -+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c -@@ -614,7 +614,6 @@ int phm_irq_process(struct amdgpu_device *adev, - * Try to do a graceful shutdown to prevent further damage. - */ - dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n"); -- orderly_poweroff(true); - } else if (src_id == VISLANDS30_IV_SRCID_CG_TSS_THERMAL_HIGH_TO_LOW) - dev_emerg(adev->dev, "ERROR: GPU under temperature range detected!\n"); - else if (src_id == VISLANDS30_IV_SRCID_GPIO_19) { -@@ -633,7 +632,6 @@ int phm_irq_process(struct amdgpu_device *adev, - * Try to do a graceful shutdown to prevent further damage. - */ - dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n"); -- orderly_poweroff(true); - } else - dev_emerg(adev->dev, "ERROR: GPU under temperature range detected!\n"); - } else if (client_id == SOC15_IH_CLIENTID_ROM_SMUIO) { -diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c -index 70b560737..11373a474 100644 ---- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c -+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c -@@ -1444,7 +1444,6 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev, - * Try to do a graceful shutdown to prevent further damage. - */ - dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n"); -- orderly_poweroff(true); - break; - case THM_11_0__SRCID__THM_DIG_THERM_H2L: - dev_emerg(adev->dev, "ERROR: GPU under temperature range detected\n"); -diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c -index 89f0f6eb1..99024cfec 100644 ---- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c -+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c -@@ -1386,7 +1386,6 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, - * Try to do a graceful shutdown to prevent further damage. - */ - dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n"); -- orderly_poweroff(true); - break; - case THM_11_0__SRCID__THM_DIG_THERM_H2L: - dev_emerg(adev->dev, "ERROR: GPU under temperature range detected\n"); diff --git a/pkgs/amdgpu-kernel-module.nix b/pkgs/amdgpu-kernel-module.nix deleted file mode 100644 index 08d7dd4..0000000 --- a/pkgs/amdgpu-kernel-module.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs -, lib -, kernel ? pkgs.linuxPackages_latest.kernel -}: - -pkgs.stdenv.mkDerivation { - pname = "amdgpu-kernel-module"; - inherit (kernel) src version postPatch nativeBuildInputs; - - kernel_dev = kernel.dev; - kernelVersion = kernel.modDirVersion; - - modulePath = "drivers/gpu/drm/amd/amdgpu"; - - buildPhase = '' - BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build - - cp $BUILT_KERNEL/Module.symvers . - cp $BUILT_KERNEL/.config . - cp $kernel_dev/vmlinux . - - make "-j$NIX_BUILD_CORES" modules_prepare - make "-j$NIX_BUILD_CORES" M=$modulePath modules - ''; - - installPhase = '' - make \ - INSTALL_MOD_PATH="$out" \ - XZ="xz -T$NIX_BUILD_CORES" \ - M="$modulePath" \ - modules_install - ''; - - meta = { - description = "AMD GPU kernel module"; - license = lib.licenses.gpl3; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 1715cba..ad777f6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,5 +5,4 @@ plymouth-theme-red = pkgs.callPackage ./plymouth-theme-red.nix { inherit inputs; }; cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { }; lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; }; - amdgpu-kernel-module = pkgs.callPackage ./amdgpu-kernel-module.nix { }; }