Updated to 6.0.9

8 files changed, 28 insertions, 133 deletions

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 04859f1..c4e31a7 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 f29dd9ddc7a2659e67f7f3ddfbf087a7729fd012 Mon Sep 17 00:00:00 2001
+From 49992931eca40344a831396bef4652a8fc7d70c2 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/8] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/6] 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 6b3bfd6..d9f6259 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 f4a5411651f402b391dddccdebc43e3461e9f749 Mon Sep 17 00:00:00 2001
+From 063f9088d320205657d15dbef4cbef78b4780ea7 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/8] mm: vmscan: fix extreme overreclaim and swap floods
+Subject: [PATCH 2/6] 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 c00810e..64b1447 100644
--- a/0003-soundwire-intel-Initialize-clock-stop-timeout.patch
+++ b/0003-soundwire-intel-Initialize-clock-stop-timeout.patch
@@ -1,7 +1,7 @@
-From f4e799545c0fc46a5899853f60776adc8671776c Mon Sep 17 00:00:00 2001
+From aa0c728c5142d9306b0e7b2ace8b42fbd0c0291f 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/8] soundwire: intel: Initialize clock stop timeout
+Subject: [PATCH 3/6] 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 738c8e0..4bbf2b7 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 87336625589872206597baab173ae6014ddf1750 Mon Sep 17 00:00:00 2001
+From b17439d6e0fb4ce52f5da66f55a250cced4fd4a8 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/8] drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag
+Subject: [PATCH 4/6] 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 e27774e..741ced6 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 2b078fa1fdcbd43a042ff49ad70f6ab2a22dffb3 Mon Sep 17 00:00:00 2001
+From 325e244c9f25829d8467ecf4d427ddcaab06b261 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/8] drm/amdgpu: use DRM_SCHED_FENCE_DONT_PIPELINE for VM
+Subject: [PATCH 5/6] 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-VRAM-BO-swap-issue.patch b/0006-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
deleted file mode 100644
index f58574f..0000000
--- a/0006-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From f2712d9d94e98733953cf567f32f7755800464ae Mon Sep 17 00:00:00 2001
-From: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
-Date: Tue, 4 Oct 2022 07:33:39 -0700
-Subject: [PATCH 6/8] drm/amdgpu: Fix VRAM BO swap issue
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-DRM buddy manager allocates the contiguous memory requests in
-a single block or multiple blocks. So for the ttm move operation
-(incase of low vram memory) we should consider all the blocks to
-compute the total memory size which compared with the struct
-ttm_resource num_pages in order to verify that the blocks are
-contiguous for the eviction process.
-
-v2: Added a Fixes tag
-v3: Rewrite the code to save a bit of calculations and
-    variables (Christian)
-
-Fixes: c9cad937c0c5 ("drm/amdgpu: add drm buddy support to amdgpu")
-Signed-off-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-index 134575a3893c..794062ab57fc 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-@@ -424,8 +424,9 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
- static bool amdgpu_mem_visible(struct amdgpu_device *adev,
- 			       struct ttm_resource *mem)
- {
--	uint64_t mem_size = (u64)mem->num_pages << PAGE_SHIFT;
-+	u64 mem_size = (u64)mem->num_pages << PAGE_SHIFT;
- 	struct amdgpu_res_cursor cursor;
-+	u64 end;
- 
- 	if (mem->mem_type == TTM_PL_SYSTEM ||
- 	    mem->mem_type == TTM_PL_TT)
-@@ -434,12 +435,18 @@ static bool amdgpu_mem_visible(struct amdgpu_device *adev,
- 		return false;
- 
- 	amdgpu_res_first(mem, 0, mem_size, &cursor);
-+	end = cursor.start + cursor.size;
-+	while (cursor.remaining) {
-+		amdgpu_res_next(&cursor, cursor.size);
- 
--	/* ttm_resource_ioremap only supports contiguous memory */
--	if (cursor.size != mem_size)
--		return false;
-+		/* ttm_resource_ioremap only supports contiguous memory */
-+		if (end != cursor.start)
-+			return false;
-+
-+		end = cursor.start + cursor.size;
-+	}
- 
--	return cursor.start + cursor.size <= adev->gmc.visible_vram_size;
-+	return end <= adev->gmc.visible_vram_size;
- }
- 
- /*
--- 
-2.38.1
-
diff --git a/0007-drm-amdgpu-Fix-for-BO-move-issue.patch b/0007-drm-amdgpu-Fix-for-BO-move-issue.patch
deleted file mode 100644
index 5543dc5..0000000
--- a/0007-drm-amdgpu-Fix-for-BO-move-issue.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 75ff02c24828d71bf13730e1a0b499591a1a4cef Mon Sep 17 00:00:00 2001
-From: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
-Date: Mon, 17 Oct 2022 13:15:21 -0700
-Subject: [PATCH 7/8] drm/amdgpu: Fix for BO move issue
-
-If there are no blocks to compare then exit
-the loop.
-
-Signed-off-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-index 794062ab57fc..9e6c23266a1a 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-@@ -439,6 +439,9 @@ static bool amdgpu_mem_visible(struct amdgpu_device *adev,
- 	while (cursor.remaining) {
- 		amdgpu_res_next(&cursor, cursor.size);
- 
-+		if (!cursor.remaining)
-+			break;
-+
- 		/* ttm_resource_ioremap only supports contiguous memory */
- 		if (end != cursor.start)
- 			return false;
--- 
-2.38.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 163a85a..956c48d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,8 +19,8 @@ _custom=0
 pkgbase=linux
 _supver=6
 _majver=0
-_minver=6
-_gccpatchver='20220315'
+_minver=9
+_gccpatchver='20221104'
 _gccpatchker='5.17+'
   if [ "$_minver" == "0" ]; then
     pkgver=${_supver}.${_majver}
@@ -47,8 +47,6 @@ 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-VRAM-BO-swap-issue.patch
-  0007-drm-amdgpu-Fix-for-BO-move-issue.patch
   kernel_compiler_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
   raid6-default-algo.patch
@@ -58,30 +56,26 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256sums=('864b05af2d869ba73d61a9c5959e4531a141ab2bd7b217483671f625f9747faa'
+sha256sums=('6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7'
             'SKIP'
             '6cae8edbfa8793f8f439b625eddac6c229b2703bb1ecb834da6339fb2b96cfbb'
-            'f1aafd32cd42e9ebb3475597db05bf27561ae52a7b48ec5bc353be3ca50925a1'
-            '0a4ab2a5f7cf2cd78ca20678775f4ead39169bd7d7ba5e7ecae9053a9c94071b'
-            'ef1e125fb021ab64aeeda696408d6ed8232a4261a0a2489afc560350fc7312bc'
-            'feac2bd6fc4ee7c566975e09cb55bdc7be192988b037a0e79fd7e51f3f914221'
-            '76052ea5929bac6b4fccc77b321cb273d6fca64426b7584fca5ff36a470d6eb1'
-            'e0e9dc4b1a0ea0fd1af0825c0b49844ea364e3163c4291b8712919f49914c4ef'
-            '1487f13aa32de66562fca3b61e8c97c45c6f8dc2362403b141be2db423fcc3e1'
-            '5a29d172d442a3f31a402d7d306aaa292b0b5ea29139d05080a55e2425f48c5c'
+            'e63fd774a7aeb34c9fe95ee086f6fdbf5303863d71115270d1015f25368be55e'
+            '597da698df84ef920286620526f43efd66036a4aef7bb937762bddce155aa3df'
+            'c79d226fa657ef74e4fc5e707129f9ec9cba7899ed751894d5daa9bcec70b0fa'
+            '475d817d60f41d1497504692e2eb9d0682a89bc78a0362a178960dea3cb42bac'
+            '8a0f3787b545db8ba18aa6ec8850e96acc8a628fb6ce4d3d7707214a5a95cd19'
+            '3a8f397b89bad95c46f42c0f80ede7536a4a45a28621e00ed486918a55f905ed'
             'e9e0d289170b7fb598b572d9c892ae8d1420952034aa415e8b3334f20a58edcc'
             '6ab863c8cfe6e0dd53a9d6455872fd4391508a8b97ab92e3f13558a6617b12a6')
-b2sums=('af53568340db3d63e3bbe8c5f27fff1e285b332845b9af960ee230c116e0555cc50857b6617d1b54f56e8de6717a940ff443cae9bf7dd8cc81326fe15ec6da5f'
+b2sums=('23ad9036cc771135c4f6bcb17950ec61e182981c4bff596062aa92cfccc66c316b35598e7a162ca4c346ca6b18796e2c5fd8112b05544fdde062faa0c3a82305'
         'SKIP'
         '45e471912f742b68bd445a2d7d9f4026147c8f315712831e12096bf98f8777404acaada639b6ffd52efbe14ec2661dc8b72464990d8c6efc83c2f4f91a01850c'
-        '8236310256459eb29f2f056972adc4e8cbcdfe034ac61c86d3931940f63e9d7c026020f7078cdb0445b8615c21f021400218f84cd583e2d13b6a6d6a23f08a18'
-        '34e940c9ff679522cc5d0df9777ad3b5eaca8bc875c314179aa882fd8b54754672dbc8250708011c1a89ec4021713a1a3e3ae8487d4217929ea02dbd757696a6'
-        '4d7cb398838de0d756c43a0c42dcd26eb88cc43a452e8f87bae665a10740f7d7743080d9112b8ac7dd4fd10fe51a7d90d5234302b795e8b5cc4a5105ee330570'
-        '3a7867e77dfacabfd96e89a84c81ae6ce3d573e6fd5cf9f1634be0b7e8d846c85e5fc6c3015f314774705b52b27ec480a82c63b342bbff8bbb28612936f95ec1'
-        'ec3964044f303732abaf7cd804eeef0aa1d5c90fbbaebbe58479e4c0a1620f185e88181a4f877f1f3eb0d81c6e74058d5960f2933af1edc50cbb5d5ef4ca2220'
-        'fa7d3d6c1b0ed25a5ecb3d024b3293a4b2989da590f2bac4be82714fa4cf14a3964a07567a86279d2f1c1a89af385d24b325b1c2bf300448ff46928dff7dc5df'
-        '1e6c45c4a5ea2846c3b311fb55eb8f869a2f39eef3fe00d02e77d3ceb8ade31cbbbb37edc796d2e690597c55fddfe5a42023b3d38d13f58d0fd9a0bd1ae18f29'
-        '20674a8fcc0a85726e06460a7dbccfe731c46bf377cc3bf511b7591175e7df892f271bc1909e77d9a02913c753d241493502c5ab15d9f78e95f31aa4399c2c27'
+        '991fb0113e0ac1b69fefa3a2e34b85a22c8c16217c320f03860ab73e677781cb1769ffd6fd4122bb43d3f05269db88b347a93b7424cfdf654fb6e64e631e9e7e'
+        '1bd4c5a68a98ab86b951f3aeb91cbd0ea65ad0513f6c8462c9bcca08f9515dab49a6580f9ad31716522793f757e2f2f016d63b64580013014618fadd447c48c1'
+        '91510880816cac70e6d29ce2d9a38993d0df25b2317760b89839d96dc061fb2f9dfcbb9473fe7bc254c5d939e1a6da0f39c540e5658b92dd954fda3080a9358a'
+        '7a9753747d9447289e3531a8791d6b297c71cfdd9da0a738069ff14910230c036e303e3031690914f73bcadfec1db5f2f25bbdb1af8a85b59cf269fd231ef1fe'
+        '4ad868a8f4d5a0d0f32c36291e37a21ec9b53f7ea424afbdafd5934cdab9e3553eefa789ede55c5cb3081f37bcef742f30465b85c686e10c442257602e59c54f'
+        '05bddc2b57189d7e302f32041079bcf60a06938e9afcfd02a0085a1430255286a5b663eed7cdb7f857717c65e9e27af4d15625b17e0a36d1b4ce1cbda6baee2b'
         'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
         'e94aa35d92cec92f4b0d487e0569790f3b712b9eaa5107f14a4200578e398ca740bf369f30f070c8beb56a72d1a6d0fc06beb650d798a64f44abe5e3af327728')
 
@@ -107,8 +101,6 @@ prepare() {
   patch -p1 -i ../0003-soundwire-intel-Initialize-clock-stop-timeout.patch
   patch -p1 -i ../0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
   patch -p1 -i ../0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
-  patch -p1 -i ../0006-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
-  patch -p1 -i ../0007-drm-amdgpu-Fix-for-BO-move-issue.patch
 
   # graysky gcc patch
   echo "Applying graysky gcc patch"
@@ -279,7 +271,7 @@ _package-headers() {
   echo "Stripping build tools..."
   local file
   while read -rd '' file; do
-    case "$(file -bi "$file")" in
+    case "$(file -Sib "$file")" in
       application/x-sharedlib\;*)      # Libraries (.so)
         strip -v $STRIP_SHARED "$file" ;;
       application/x-archive\;*)        # Libraries (.a)