From f5c944188869df3184ceb052641de7d412354e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kwilczynski@omarchy.org>
Date: Thu, 17 Sep 2026 08:52:45 +0900
Subject: [PATCH] Add fix for swapped-out TTM resources never leaving their
 bulk_move range
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Krzysztof Wilczyński <kwilczynski@omarchy.org>
---
 ...tm-swapped-out-resource-leaves-bulk-move.patch |  12 ++++++++++++
 ...wapped-out-resource-leaves-bulk-move.patch.sig | Bin 0 -> 594 bytes
 pkgbuilds/linux-omarchy-bore/PKGBUILD             |   5 +++++
 ...tm-swapped-out-resource-leaves-bulk-move.patch |  12 ++++++++++++
 ...wapped-out-resource-leaves-bulk-move.patch.sig | Bin 0 -> 594 bytes
 pkgbuilds/linux-omarchy/PKGBUILD                  |   5 +++++
 6 files changed, 34 insertions(+)
 create mode 100644 pkgbuilds/linux-omarchy-bore/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch
 create mode 100644 pkgbuilds/linux-omarchy-bore/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch.sig
 create mode 100644 pkgbuilds/linux-omarchy/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch
 create mode 100644 pkgbuilds/linux-omarchy/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch.sig

diff --git a/pkgbuilds/linux-omarchy-bore/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch b/pkgbuilds/linux-omarchy-bore/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch
new file mode 100644
index 00000000..6977a84b
--- /dev/null
+++ b/pkgbuilds/linux-omarchy-bore/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch
@@ -0,0 +1,12 @@
+diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
+--- a/drivers/gpu/drm/ttm/ttm_bo.c
++++ b/drivers/gpu/drm/ttm/ttm_bo.c
+@@ -1343,7 +1343,7 @@ ttm_bo_swapout_cb(struct ttm_lru_walk *walk, struct ttm_buffer_object *bo)
+ 
+ 	if (ttm_tt_is_populated(tt)) {
+ 		ret = ttm_tt_swapout(bdev, tt, swapout_walk->gfp_flags);
+-		if (!ret) {
++		if (ret > 0) {
+ 			spin_lock(&bdev->lru_lock);
+ 			ttm_resource_del_bulk_move_unevictable(bo->resource, bo);
+ 			ttm_resource_move_to_lru_tail(bo->resource);
diff --git a/pkgbuilds/linux-omarchy-bore/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch.sig b/pkgbuilds/linux-omarchy-bore/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch.sig
new file mode 100644
index 0000000000000000000000000000000000000000..bd99af47a4b81b26edc0c426ee3d6b1bfc9a1686
GIT binary patch
literal 594
zcmV-Y0<Hat0#5`00SEv&79j)@(tTZwj+^nSynK9oWOj``<22_50&1%t;~Nx!00000
z1ON_gVQzIYEHW-ND={uHGAuAGG5`t*5PW2IjXmQu=eEla{xW15Erw|2O^NJ}T|ui;
zC7_7?Gs8o9p(R%o%*8&9q`jGlCB7dy>aDwlM0_EaL^LpfS!B+rD;gB+pSl<sp_NYb
zig^(oGdt&bXtDc%dWQq2mN%yk>(&-OS(1OOkvh%5N+-ImQJ|R}a$v?RPh@HRX;o6|
zhA+~XYA2kKAVdb&Q}f)W#@axdJDdyrBs2kcr<vERxhJ!Ya*BfrJ%0@KFikBW8!iQQ
z4JLlLss~3oQ^n~LlqQuJ;}~hGp^vqgm&P)d>Oh(6WQ+(u-cao9EI!k)L6)>X;2_dY
zb%TVrvYLA`$xb5QvU%>bqr^u7hDuQ<rH2&-ckR)^3L=3BRKwyiQ<$;m9PU4ObM`h0
zE?D$wy6af6qhM^W+vPs1*>5lbn(&WK=v#{B*oik1Iyv!;zJfO`oGu6IH8<DFQyQ>l
zEn2T&P06$1?bo5O)o()igxe>{aDB8Rk+EF~wBYG+YEEnAQT#6?^`P1%k8V?|`|%`_
z_v5r24b$DbB1Z8li1r?IdJSR*T&*1`VUp@b2w5SPGJ(TKzWUM^KTd!aLbC&1OB|D3
z=UK#}1Xei?j6*niL{U@Q{j~Ol-(TO|)?Uuxp3;pTr<GvSGLd=6rAgKPTtIzD5Y80S
guE5OAJ8XJxsXtkWAuT0P#wQ|e`_{lSeJbzLvRkqfxBvhE

literal 0
HcmV?d00001

diff --git a/pkgbuilds/linux-omarchy-bore/PKGBUILD b/pkgbuilds/linux-omarchy-bore/PKGBUILD
index 5fcf8310..3f38f936 100644
--- a/pkgbuilds/linux-omarchy-bore/PKGBUILD
+++ b/pkgbuilds/linux-omarchy-bore/PKGBUILD
@@ -83,6 +83,7 @@ source=(
   0313-fuse-background-wakeup.patch{,.sig}
   0350-drm-edid-populate-monitor-range-from-displayid-adaptive-sync.patch{,.sig}
   0360-gpu-mem-cgroup.patch{,.sig}
+  0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch{,.sig}
   0400-drm-i915-alpm-limit-pr-alpm-to-panel-replay.patch{,.sig}
   0401-drm-i915-psr-exit-panel-replay-for-alpm-lag.patch{,.sig}
   0402-psr2-early-transport-panels.patch{,.sig}
@@ -219,6 +220,8 @@ b2sums=('48551bee71cd02815136fb8abe7da4464c2e17c89ef35cb0c0530c8b969fe12127ca97a
         'SKIP'
         '1124c5c3fd5104c886c841ead1ae9afb42683388b640b1a86523dad9919c6bd59a1f78b07ee5a213e0dca77c636a29676af0592d4ed1735ea35f282f6f23e46f'
         'SKIP'
+        '15855e9c28cb0abaab7ab606904dfc84d426ccab44edae59f0e1f092202b80525929f8d394d04ca1513d1d5dfc2cfc108a66a9c1cb42b9966c6417562ef20689'
+        'SKIP'
         '505bf01a9d6b0926b557b673bb686d1a4ff73ee70539991e52272fbf58aad3ea25cf5ffc5c2d094a2d5e78b18a1a134f2ab530f595073a2d3eba9ff2c1418e1e'
         'SKIP'
         'b33b46c37f12f7650a67c3731b87ff84add1ac8623cc96b52223a1ef9946bcaa990ed7c7036674e228335f57ec9ed421ea4d6c1dd72d19b516215d9ac2c7c3ee'
@@ -408,6 +411,8 @@ sha256sums=('55ddf0df8325d9dad96fcff7bd93977d22e3f50af06527572af59b77c7632b78'
             'SKIP'
             'e303da14a3c8a15fd1cb45394138f03dd16e66d2ac0d1ebcd933977df937d771'
             'SKIP'
+            '503eba8d7a80b978fccdaac798f57cbb6cd2b2b04fd04c46399daa004b6646dc'
+            'SKIP'
             '1f0c958b64ba48b8dc8b5548e1ad1934b8d4903fc16fec15014759e3681ea275'
             'SKIP'
             '47994d576008a377de612ed77e6b2e7bc6b24ad3a30a6d157646d380ae323142'
diff --git a/pkgbuilds/linux-omarchy/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch b/pkgbuilds/linux-omarchy/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch
new file mode 100644
index 00000000..6977a84b
--- /dev/null
+++ b/pkgbuilds/linux-omarchy/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch
@@ -0,0 +1,12 @@
+diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
+--- a/drivers/gpu/drm/ttm/ttm_bo.c
++++ b/drivers/gpu/drm/ttm/ttm_bo.c
+@@ -1343,7 +1343,7 @@ ttm_bo_swapout_cb(struct ttm_lru_walk *walk, struct ttm_buffer_object *bo)
+ 
+ 	if (ttm_tt_is_populated(tt)) {
+ 		ret = ttm_tt_swapout(bdev, tt, swapout_walk->gfp_flags);
+-		if (!ret) {
++		if (ret > 0) {
+ 			spin_lock(&bdev->lru_lock);
+ 			ttm_resource_del_bulk_move_unevictable(bo->resource, bo);
+ 			ttm_resource_move_to_lru_tail(bo->resource);
diff --git a/pkgbuilds/linux-omarchy/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch.sig b/pkgbuilds/linux-omarchy/0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch.sig
new file mode 100644
index 0000000000000000000000000000000000000000..8ca1431f4cc3105e2d1f56c1079456fac8471294
GIT binary patch
literal 594
zcmV-Y0<Hat0#5`00SEv&79j)@(tTZwj+^nSynK9oWOj``<22_50&1%t+8Y#r00000
z1ON_gVQzIYEHW-ND={uHGAuAGG5`t*5PW2IjXmQu=c<hl{S?p*$t+$L5}XfSA}G1U
z(^5q#zka%b%hu(UOO^@PYRb7tSDwnaJ$DqhQEF?;Rw%))<Z%^TJa(tyt=kcGuEya-
zaf1roU{E95ql<%Zo|ee6f@NICh7`X!-}r44&+b?tB<cW7C(_YT;q2fi!wuiICH%<t
z9Q|s)i^wbNyR=m^m(CF<(6kdMjMRh0&=ho0>`A$C`ueNWIW<W)7&wn(?Rg1FO?z-V
z&I(sAJNJBXC3vBEeYVLT8l0irTCf-Sutb34cnz93BDDQ85O2G^O0I^8m}7Oska@hq
z$va|G<6q3~WgT*W0+pK0qX4hDC(gZfV%LeO9xW&)1#t3Yxo-KwZSWlZ)senJJ{oA*
z)8gZnJJ6P`9d4K!Wh5x)2_lW?*T6<Rpo+Hj_OQIs`W_bGJ&SGcI3`fn9lo*G#3=Yd
zRtS1eMS0$x;6c4>hzeXL`nLBMG)wnDb&h_u6q2Ra1bZqB-5kLa3tp4#Re*0BryHtF
zTIS<8^K|&WN}87XhKX_tEEvDoeote+iHs^(-azI)s_DhLa-eQwzwCFiuYRBqcd(yn
z?Ex|e;g+r#rfgfVE;gz9J4stGo9BJ>?m4Gp2*_fL{){zt49mZAeD_tf`wvqn%91Op
gA_wUlFV~6%tgbYt5j%EUaS@KrM{dYwm;86%C=fv#?*IS*

literal 0
HcmV?d00001

diff --git a/pkgbuilds/linux-omarchy/PKGBUILD b/pkgbuilds/linux-omarchy/PKGBUILD
index 660c9e2d..8a63277a 100644
--- a/pkgbuilds/linux-omarchy/PKGBUILD
+++ b/pkgbuilds/linux-omarchy/PKGBUILD
@@ -82,6 +82,7 @@ source=(
   0313-fuse-background-wakeup.patch{,.sig}
   0350-drm-edid-populate-monitor-range-from-displayid-adaptive-sync.patch{,.sig}
   0360-gpu-mem-cgroup.patch{,.sig}
+  0361-drm-ttm-swapped-out-resource-leaves-bulk-move.patch{,.sig}
   0400-drm-i915-alpm-limit-pr-alpm-to-panel-replay.patch{,.sig}
   0401-drm-i915-psr-exit-panel-replay-for-alpm-lag.patch{,.sig}
   0402-psr2-early-transport-panels.patch{,.sig}
@@ -216,6 +217,8 @@ b2sums=('48551bee71cd02815136fb8abe7da4464c2e17c89ef35cb0c0530c8b969fe12127ca97a
         'SKIP'
         '1124c5c3fd5104c886c841ead1ae9afb42683388b640b1a86523dad9919c6bd59a1f78b07ee5a213e0dca77c636a29676af0592d4ed1735ea35f282f6f23e46f'
         'SKIP'
+        '15855e9c28cb0abaab7ab606904dfc84d426ccab44edae59f0e1f092202b80525929f8d394d04ca1513d1d5dfc2cfc108a66a9c1cb42b9966c6417562ef20689'
+        'SKIP'
         '505bf01a9d6b0926b557b673bb686d1a4ff73ee70539991e52272fbf58aad3ea25cf5ffc5c2d094a2d5e78b18a1a134f2ab530f595073a2d3eba9ff2c1418e1e'
         'SKIP'
         'b33b46c37f12f7650a67c3731b87ff84add1ac8623cc96b52223a1ef9946bcaa990ed7c7036674e228335f57ec9ed421ea4d6c1dd72d19b516215d9ac2c7c3ee'
@@ -403,6 +406,8 @@ sha256sums=('55ddf0df8325d9dad96fcff7bd93977d22e3f50af06527572af59b77c7632b78'
             'SKIP'
             'e303da14a3c8a15fd1cb45394138f03dd16e66d2ac0d1ebcd933977df937d771'
             'SKIP'
+            '503eba8d7a80b978fccdaac798f57cbb6cd2b2b04fd04c46399daa004b6646dc'
+            'SKIP'
             '1f0c958b64ba48b8dc8b5548e1ad1934b8d4903fc16fec15014759e3681ea275'
             'SKIP'
             '47994d576008a377de612ed77e6b2e7bc6b24ad3a30a6d157646d380ae323142'