Update to 6.0.8-1

8 files changed, 71 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ed1e88a4c64..098e6779335f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 6.0.7
+	pkgver = 6.0.8
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -11,28 +11,30 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.7.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.7.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.8.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.8.tar.sign
 	source = config
-	source = more-uarches-20221022.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221022.tar.gz
+	source = more-uarches-20221104.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221104.tar.gz
 	source = ck-hrtimer-5be918e798e2c2cc94fa7dd0f6f031921a4f7598.tar.gz::https://github.com/graysky2/linux-patches/archive/5be918e798e2c2cc94fa7dd0f6f031921a4f7598.tar.gz
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
 	source = 0003-soundwire-intel-Initialize-clock-stop-timeout.patch
 	source = 0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
 	source = 0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
+	source = 0006-drm-amdgpu-Fix-the-lpfn-checking-condition-in-drm-bu.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 67dacc2b78605a56e997f4c08d009be87c98ec66f1870220226c8b3cc676590f
+	sha256sums = 0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257
 	sha256sums = SKIP
 	sha256sums = 05168cbbeb6378eec6c84fe3300cede4fa5cf6130c39fb8af95040529bd390a6
-	sha256sums = 2d50a108a111a7f135f91b2676539d0a163e38ee72874d091aed0e1e86f2d477
+	sha256sums = 3a8f397b89bad95c46f42c0f80ede7536a4a45a28621e00ed486918a55f905ed
 	sha256sums = 85b197dbe033264925b4803b3c8907ed73b967061c098e269eacd5575d6da34b
-	sha256sums = e36c9d26b887f52e9cdae99604009ffdf80dd00ecc1788000529be3d3cddac15
-	sha256sums = c693877c7fad635fa37662c571baa901a991f0658151de70dce32019efb00be1
-	sha256sums = 80dc03e2b79147542ea32aaaf964c811e62f126a0ec115c6255493827911c343
-	sha256sums = 7103f9525bea1c2cc766c9b70c827c5af2af6ad51c6b9c2a471729882196b05b
-	sha256sums = a55abfbdf878c282510afc967fad7df6d3c98ed7279cc562ca885d85eb77cceb
+	sha256sums = ff9076ecd73cc7725d2c9c0d9d381904b9bcc75cffc0da7ecccc0886c99b02a2
+	sha256sums = b9a998b084cd583dac4cc755aab79e8810013c4c0d6d9f5e4fa78d2939314ced
+	sha256sums = 757cb209f1b1759f4c9efcc77501be9ee73676db069d0440104255ab35c4cdd0
+	sha256sums = a3ffe9f133029d60bf8fa66775cee64e160ddf33c265e7807eb3dea7d1981ac4
+	sha256sums = 26669e4925ac1869eeb53a7d9578c8af742c6a7e8cdcdb9af2c081774581a032
+	sha256sums = e5f5ebed349af1a95c9c8360fbe07d78ec4dff11cd7a228e436cf21e6409ebe9
 
 pkgname = linux-ck
 	pkgdesc = The Linux kernel and modules with ck's hrtimer patches
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 78e7c255ca36..729a9b92202a 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From 0d2471f0322951cdfdebea9664a40940679d18b3 Mon Sep 17 00:00:00 2001
+From d6cebe6cf6f0f344134326a02131a281f507c437 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/6] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
diff --git a/0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch b/0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
index 3bc9091ece09..0dc77994236f 100644
--- a/0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
+++ b/0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
@@ -1,7 +1,7 @@
-From aed09e7266d85688020ad1f85cc7cf1a3e41925a Mon Sep 17 00:00:00 2001
+From 3289d1b987742ac1a7fdabdc91db1849844e8713 Mon Sep 17 00:00:00 2001
 From: Johannes Weiner <hannes@cmpxchg.org>
 Date: Tue, 2 Aug 2022 12:28:11 -0400
-Subject: [PATCH 2/6] mm: vmscan: fix extreme overreclaim and swap floods
+Subject: [PATCH 2/7] mm: vmscan: fix extreme overreclaim and swap floods
 
 During proactive reclaim, we sometimes observe severe overreclaim, with
 several thousand times more pages reclaimed than requested.
diff --git a/0003-soundwire-intel-Initialize-clock-stop-timeout.patch b/0003-soundwire-intel-Initialize-clock-stop-timeout.patch
index 83df7202713f..fd8c8abd0cd1 100644
--- a/0003-soundwire-intel-Initialize-clock-stop-timeout.patch
+++ b/0003-soundwire-intel-Initialize-clock-stop-timeout.patch
@@ -1,7 +1,7 @@
-From 774364abb45970689ef975dc4c1feb4ee7d1d303 Mon Sep 17 00:00:00 2001
+From 6daf906d3fd4818ba9be0a806df94f7a4c20f263 Mon Sep 17 00:00:00 2001
 From: Sjoerd Simons <sjoerd@collabora.com>
 Date: Sat, 8 Oct 2022 21:57:51 +0200
-Subject: [PATCH 3/6] soundwire: intel: Initialize clock stop timeout
+Subject: [PATCH 3/7] soundwire: intel: Initialize clock stop timeout
 
 The bus->clk_stop_timeout member is only initialized to a non-zero value
 during the codec driver probe. This can lead to corner cases where this
@@ -17,6 +17,7 @@ bus->clk_stop_timeout is set as the maximum required by all codecs
 connected on the bus.
 
 Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
+For: https://github.com/thesofproject/linux/issues/3777
 ---
  drivers/soundwire/intel.c | 1 +
  1 file changed, 1 insertion(+)
diff --git a/0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch b/0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
index 100e5a0b843e..8f58ced64ba3 100644
--- a/0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
+++ b/0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
@@ -1,7 +1,7 @@
-From cbee9c0bd035c1eb01c324ee52b843ec3408c6aa Mon Sep 17 00:00:00 2001
+From 3a3573ec2d5f7453819ff0c2701501e753a71907 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
 Date: Fri, 7 Oct 2022 09:51:13 +0200
-Subject: [PATCH 4/6] drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag
+Subject: [PATCH 4/7] drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch b/0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
index 7e9f8c38222b..b6a85f9e4d21 100644
--- a/0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
+++ b/0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
@@ -1,7 +1,7 @@
-From 0ae90abcdbe69e70c976de31282e9e930209ad71 Mon Sep 17 00:00:00 2001
+From 5d9fceb0e65b7ac6aa6426fc6957e999f1cc2b9f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
 Date: Fri, 7 Oct 2022 10:59:58 +0200
-Subject: [PATCH 5/6] drm/amdgpu: use DRM_SCHED_FENCE_DONT_PIPELINE for VM
+Subject: [PATCH 5/7] drm/amdgpu: use DRM_SCHED_FENCE_DONT_PIPELINE for VM
  updates
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/0006-drm-amdgpu-Fix-the-lpfn-checking-condition-in-drm-bu.patch b/0006-drm-amdgpu-Fix-the-lpfn-checking-condition-in-drm-bu.patch
new file mode 100644
index 000000000000..f841f327d94d
--- /dev/null
+++ b/0006-drm-amdgpu-Fix-the-lpfn-checking-condition-in-drm-bu.patch
@@ -0,0 +1,36 @@
+From abb7ab2ef180b3d934e779f805bacd53b6c6e76d Mon Sep 17 00:00:00 2001
+From: Ma Jun <Jun.Ma2@amd.com>
+Date: Wed, 14 Sep 2022 20:53:31 +0800
+Subject: [PATCH 6/7] drm/amdgpu: Fix the lpfn checking condition in drm buddy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Because the value of man->size is changed during suspend/resume process,
+use mgr->mm.size instead of man->size here for lpfn checking.
+
+Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
+Suggested-by: Christian König <christian.koenig@amd.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220914125331.2467162-1-Jun.Ma2@amd.com
+Signed-off-by: Christian König <christian.koenig@amd.com>
+For: https://bugs.archlinux.org/task/76198
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+index 28ec5f8ac1c1..27159f1d112e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+@@ -435,7 +435,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
+ 	if (place->flags & TTM_PL_FLAG_TOPDOWN)
+ 		vres->flags |= DRM_BUDDY_TOPDOWN_ALLOCATION;
+ 
+-	if (fpfn || lpfn != man->size)
++	if (fpfn || lpfn != mgr->mm.size)
+ 		/* Allocate blocks in desired range */
+ 		vres->flags |= DRM_BUDDY_RANGE_ALLOCATION;
+ 
+-- 
+2.38.1
+
diff --git a/PKGBUILD b/PKGBUILD
index f4d3535af406..9be97e08bc47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -68,7 +68,7 @@ _subarch=
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 pkgbase=linux-ck
-pkgver=6.0.7
+pkgver=6.0.8
 pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -84,7 +84,7 @@ options=('!strip')
 _ckhrtimer=linux-6.0.y
 _commit=5be918e798e2c2cc94fa7dd0f6f031921a4f7598
 
-_gcc_more_v=20221022
+_gcc_more_v=20221104
 source=(
   "https://www.kernel.org/pub/linux/kernel/v6.x/linux-$pkgver.tar".{xz,sign}
   config         # the main kernel config file
@@ -95,21 +95,23 @@ source=(
   0003-soundwire-intel-Initialize-clock-stop-timeout.patch
   0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
   0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
+  0006-drm-amdgpu-Fix-the-lpfn-checking-condition-in-drm-bu.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('67dacc2b78605a56e997f4c08d009be87c98ec66f1870220226c8b3cc676590f'
+sha256sums=('0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257'
             'SKIP'
             '05168cbbeb6378eec6c84fe3300cede4fa5cf6130c39fb8af95040529bd390a6'
-            '2d50a108a111a7f135f91b2676539d0a163e38ee72874d091aed0e1e86f2d477'
+            '3a8f397b89bad95c46f42c0f80ede7536a4a45a28621e00ed486918a55f905ed'
             '85b197dbe033264925b4803b3c8907ed73b967061c098e269eacd5575d6da34b'
-            'e36c9d26b887f52e9cdae99604009ffdf80dd00ecc1788000529be3d3cddac15'
-            'c693877c7fad635fa37662c571baa901a991f0658151de70dce32019efb00be1'
-            '80dc03e2b79147542ea32aaaf964c811e62f126a0ec115c6255493827911c343'
-            '7103f9525bea1c2cc766c9b70c827c5af2af6ad51c6b9c2a471729882196b05b'
-            'a55abfbdf878c282510afc967fad7df6d3c98ed7279cc562ca885d85eb77cceb')
+            'ff9076ecd73cc7725d2c9c0d9d381904b9bcc75cffc0da7ecccc0886c99b02a2'
+            'b9a998b084cd583dac4cc755aab79e8810013c4c0d6d9f5e4fa78d2939314ced'
+            '757cb209f1b1759f4c9efcc77501be9ee73676db069d0440104255ab35c4cdd0'
+            'a3ffe9f133029d60bf8fa66775cee64e160ddf33c265e7807eb3dea7d1981ac4'
+            '26669e4925ac1869eeb53a7d9578c8af742c6a7e8cdcdb9af2c081774581a032'
+            'e5f5ebed349af1a95c9c8360fbe07d78ec4dff11cd7a228e436cf21e6409ebe9')
 
 prepare() {
   cd linux-${pkgver}