machines/home: back to LTS kernel
This commit is contained in:
parent
cdad1f06b1
commit
3c3c568550
4 changed files with 19 additions and 77 deletions
|
@ -4,7 +4,6 @@
|
|||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./patches.nix
|
||||
../modules/common.nix
|
||||
../modules/sound.nix
|
||||
../modules/window_manager.nix
|
||||
|
@ -17,7 +16,7 @@
|
|||
|
||||
# Configure kernel
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
extraModulePackages = with config.boot.kernelPackages; [
|
||||
rtl88x2bu
|
||||
];
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
# Fix black screen after resuming from suspend
|
||||
# Source: https://discourse.nixos.org/t/black-screen-when-resuming-from-suspend/10299
|
||||
#
|
||||
# Issue: https://gitlab.freedesktop.org/drm/amd/-/issues/2223
|
||||
# Fixed in 6.1-rc4
|
||||
specialisation."amdgpu-patch-2223" = {
|
||||
inheritParentConfig = true;
|
||||
configuration = {
|
||||
boot.loader.grub.configurationName = "amdgpu-patch-2223";
|
||||
#boot.kernelPackages = pkgs.linuxPackages_6_0;
|
||||
boot.kernelPatches = [
|
||||
{
|
||||
name = "amdgpu-patch";
|
||||
patch = ./patches/fail_suspend.patch;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,37 +0,0 @@
|
|||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||
index fb9b9349215b8..12c69b7ee54df 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||
@@ -4047,15 +4047,17 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)
|
||||
* at suspend time.
|
||||
*
|
||||
*/
|
||||
-static void amdgpu_device_evict_resources(struct amdgpu_device *adev)
|
||||
+static int amdgpu_device_evict_resources(struct amdgpu_device *adev)
|
||||
{
|
||||
+ int ret;
|
||||
/* No need to evict vram on APUs for suspend to ram or s2idle */
|
||||
if ((adev->in_s3 || adev->in_s0ix) && (adev->flags & AMD_IS_APU))
|
||||
- return;
|
||||
+ return 0;
|
||||
|
||||
- if (amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM))
|
||||
+ ret = amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM);
|
||||
+ if (ret)
|
||||
DRM_WARN("evicting device resources failed\n");
|
||||
-
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -4105,7 +4107,9 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
|
||||
if (!adev->in_s0ix)
|
||||
amdgpu_amdkfd_suspend(adev, adev->in_runpm);
|
||||
|
||||
- amdgpu_device_evict_resources(adev);
|
||||
+ r = amdgpu_device_evict_resources(adev);
|
||||
+ if (r)
|
||||
+ return r;
|
||||
|
||||
amdgpu_fence_driver_hw_fini(adev);
|
||||
|
|
@ -59,26 +59,26 @@ let
|
|||
};
|
||||
};
|
||||
};
|
||||
lualine.settings = {
|
||||
options.ignore_focus = [ "NvimTree" ];
|
||||
sections = {
|
||||
lualine_a = [
|
||||
[ "filename" (mkNamedField "path" 1) ]
|
||||
];
|
||||
lualine_b = [ "branch" "diff" "diagnostics" ];
|
||||
lualine_c = [ "lsp_progress" ];
|
||||
lualine_x = [ "filesize" "filetype" ];
|
||||
lualine_y = [ "progress" ];
|
||||
lualine_z = [ "location" "mode" ];
|
||||
};
|
||||
};
|
||||
orgmode.settings = {
|
||||
org_agenda_files = [ "~/orgs/**/*" ];
|
||||
org_default_notes_file = "~/orgs/refile.org";
|
||||
win_split_mode = "tabnew";
|
||||
org_hide_leading_stars = true;
|
||||
};
|
||||
lualine.settings = {
|
||||
options.ignore_focus = [ "NvimTree" ];
|
||||
sections = {
|
||||
lualine_a = [
|
||||
[ "filename" (mkNamedField "path" 1) ]
|
||||
];
|
||||
lualine_b = [ "branch" "diff" "diagnostics" ];
|
||||
lualine_c = [ "lsp_progress" ];
|
||||
lualine_x = [ "filesize" "filetype" ];
|
||||
lualine_y = [ "progress" ];
|
||||
lualine_z = [ "location" "mode" ];
|
||||
};
|
||||
};
|
||||
orgmode.settings = {
|
||||
org_agenda_files = [ "~/orgs/**/*" ];
|
||||
org_default_notes_file = "~/orgs/refile.org";
|
||||
win_split_mode = "tabnew";
|
||||
org_hide_leading_stars = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
Loading…
Reference in a new issue