From 761a33c1fbce2e7cc40eb4ef2367a3ec53cdce77 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 8 Feb 2024 22:14:41 +0100 Subject: [PATCH 1/4] direnv: prefer usage of nix-direnv over lorri --- home/home.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index eab8c69..1640cff 100644 --- a/home/home.nix +++ b/home/home.nix @@ -119,7 +119,6 @@ let ]; nixHelpers = [ - lorri nixpkgs-review nixpkgs-fmt nix-top @@ -282,6 +281,7 @@ in programs.direnv = { enable = true; + nix-direnv.enable = true; enableZshIntegration = true; }; @@ -324,6 +324,7 @@ in systemd.user.startServices = true; + # for backwards compatibility services.lorri.enable = true; # media button control support from Bluetooth devices From 7ec8fa2d446daa421c8b03d17e1b621c85450068 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 9 Feb 2024 00:05:00 +0100 Subject: [PATCH 2/4] [flake lock update] --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f5da859..0887fc4 100644 --- a/flake.lock +++ b/flake.lock @@ -174,11 +174,11 @@ }, "logseq-fix-nixpkgs": { "locked": { - "lastModified": 1706807864, - "narHash": "sha256-Zxctw9B6bbrw5QR4vpF/bAn8SgreeVBrdibAYXn+HWk=", + "lastModified": 1707316439, + "narHash": "sha256-3dVL8Wk7ECMiQrHVO1ys7FawMLo7iyQJyKG+aie1eaE=", "owner": "schmittlauch", "repo": "nixpkgs", - "rev": "e6cd575ea5c2d1182485d57234b31856ffc6b7d2", + "rev": "6f1431c8e2dfdfdfe25837c2cc94857900153cab", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706826059, - "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", + "lastModified": 1707238373, + "narHash": "sha256-WKxT0yLzWbFZwYi92lI0yWJpYtRaFSWHGX8QXzejapw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", + "rev": "fb0c047e30b69696acc42e669d02452ca1b55755", "type": "github" }, "original": { From a18b8a685e5040915c0460f6858c13016b453e24 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 9 Feb 2024 00:05:31 +0100 Subject: [PATCH 3/4] framenix: use targeted patch instead of reverts --- ...e-alloc_range-error-handling-routine.patch | 47 +++++++++++++++++++ hosts/framenix/default.nix | 28 ++--------- 2 files changed, 50 insertions(+), 25 deletions(-) create mode 100644 hosts/framenix/0001-drm-buddy-Improve-alloc_range-error-handling-routine.patch diff --git a/hosts/framenix/0001-drm-buddy-Improve-alloc_range-error-handling-routine.patch b/hosts/framenix/0001-drm-buddy-Improve-alloc_range-error-handling-routine.patch new file mode 100644 index 0000000..cc0d4a0 --- /dev/null +++ b/hosts/framenix/0001-drm-buddy-Improve-alloc_range-error-handling-routine.patch @@ -0,0 +1,47 @@ +From 6e77e6de7582f35138fa1c7523268602ecb2e0a0 Mon Sep 17 00:00:00 2001 +From: Arunpravin Paneer Selvam +Date: Tue, 6 Feb 2024 10:39:24 -0800 +Subject: [PATCH] drm/buddy: Improve alloc_range error handling routine + +If alloc_range() couldn't allocate the requuired size, +return -ENOSPC. + +Signed-off-by: Arunpravin Paneer Selvam +--- + drivers/gpu/drm/drm_buddy.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c +index f57e6d74fb0e..d5aba6392da0 100644 +--- a/drivers/gpu/drm/drm_buddy.c ++++ b/drivers/gpu/drm/drm_buddy.c +@@ -483,9 +483,9 @@ static int __alloc_range(struct drm_buddy *mm, + struct list_head *blocks, + u64 *total_allocated_on_err) + { ++ u64 total_allocated = 0, allocated_size = 0; + struct drm_buddy_block *block; + struct drm_buddy_block *buddy; +- u64 total_allocated = 0; + LIST_HEAD(allocated); + u64 end; + int err; +@@ -539,6 +539,15 @@ static int __alloc_range(struct drm_buddy *mm, + } while (1); + + list_splice_tail(&allocated, blocks); ++ ++ list_for_each_entry(block, blocks, link) ++ allocated_size += drm_buddy_block_size(mm, block); ++ ++ if (allocated_size < size) { ++ err = -ENOSPC; ++ goto err_free; ++ } ++ + return 0; + + err_undo: +-- +2.25.1 + diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 20b6776..1e40ffd 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -33,31 +33,9 @@ in # revert some commits that introduced the clourful graphics artefacts flickering, # at least that's the current working hypothesis in https://gitlab.freedesktop.org/drm/amd/-/issues/3097 boot.kernelPatches = [ - {name = "revert 9ae587f850a6702428273fcf4a2a9b392349b2a3"; - patch = (pkgs.fetchpatch { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=9ae587f850a6702428273fcf4a2a9b392349b2a3"; - hash = "sha256-5Uu8zxRSQuqE8oymjwPMt/ylsItpkQVDhbrOSMj8g3I="; - revert = true; - });} - {name = "revert 2eb412aa25ed2bf59f5ad5f7a09787d182d67934"; - patch = (pkgs.fetchpatch { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=2eb412aa25ed2bf59f5ad5f7a09787d182d67934"; - hash = "sha256-VtsH6bmwaLxPZ+uXvVE6qVWD2/aIKf9GLuMTNKq6d8M="; - revert = true; - });} - {name = "revert 0a1844bf0b532d84324453374ad6845f64066c28"; - patch = (pkgs.fetchpatch { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=0a1844bf0b532d84324453374ad6845f64066c28"; - hash = "sha256-Zd2pcYiOmuuzcc7THNtJW/YTjPyzO7HmQYKJNzy9YPw="; - revert = true; - }); - # alternatively, 8569c3154538 can be reverted as well - extraStructuredConfig = with lib.kernel; { - DRM_I915 = no; - DRM_I915_GVT = lib.mkForce unset; - DRM_I915_GVT_KVMGT = lib.mkForce unset; - }; - } + {name = "patch attempt from https://gitlab.freedesktop.org/drm/amd/-/issues/3097#note_2271482"; + patch = ./0001-drm-buddy-Improve-alloc_range-error-handling-routine.patch; + } ]; # temporary workaround for white flickering graphics artefacts From 087cb1caf91f75a3490acd1e90b854d27fdc5009 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 9 Feb 2024 00:44:53 +0100 Subject: [PATCH 4/4] framenix kernel: 6.8-rc2 -> 6.8-rc3 --- hosts/framenix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 1e40ffd..f2282de 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -24,10 +24,10 @@ in argsOverride = rec { src = pkgs.fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-LiNkYsgTJby9MctxxLWKUhsH1hNnGRJNDjyv+FwsXXU="; + hash = "sha256-9CfwhjawHkMjNYqqJAHq9dQnpeWm0qH/UOAnSu82mNQ="; }; - version = "6.8-rc2"; - modDirVersion = "6.8.0-rc2"; + version = "6.8-rc3"; + modDirVersion = "6.8.0-rc3"; }; }); # revert some commits that introduced the clourful graphics artefacts flickering,