summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO20
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch4
-rw-r--r--0002-Bluetooth-btusb-check-conditions-before-enabling-USB.patch4
-rw-r--r--0003-drm-amdgpu-handle-VCN-instances-when-harvesting.patch61
-rw-r--r--PKGBUILD12
5 files changed, 83 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 158a58ac2d4b..b3ded6d33800 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.13.10rc1
+ pkgver = 5.13.11rc1
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -12,22 +12,24 @@ pkgbase = linux-rc
makedepends = tar
makedepends = xz
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.10-rc1.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.10-rc1.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.9.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.9.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.11-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.11-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.10.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.10.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = 0002-Bluetooth-btusb-check-conditions-before-enabling-USB.patch
+ source = 0003-drm-amdgpu-handle-VCN-instances-when-harvesting.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- b2sums = 58c3925c8fed8af4ed475e6c56af75f9b022919d5b86a2c4646957f564af08baba3232e4dc7669197a10fbc9c3f18c6787bc816d6055e8323e69867e913c9d9e
+ b2sums = 795d2886344676676256d496fb2c4fae53b9c1a7a9f47e71aab09bce7d09e69174b799e78c516927f00c772d5c317e438ea35175d4af51e2dc246dff1c0a96aa
b2sums = SKIP
- b2sums = ac535116a6c5877096b0144358fbe1140edd21ef6cd857dc4684d3da0c5c1892e055df35a69eab7dae2ab1820a3efa5ef5a6fa864969c6332ca7c7930cb77313
+ b2sums = 511c7e1cc447dfe2a0e287982d485b7071df8c242046b8e0ef1bc402adb8d1f8d375e730dbb4f94fbf6eb2a2972b1cbbd43b9935f5007710804f1ca444ac7b55
b2sums = SKIP
b2sums = 65c2a6790e288fd7bfab74ffb5a93c91ae880d699338852ffc2059c666974fdc469ee36e0d1455f74a4c377ba749649173347af0a054328032fd866688739c04
- b2sums = e6df0ce8d665261cffc930e0a99023abd1b26caf1e89dda756cf76713953e6b3a36d3210a4c01beedb2a28acc357a9880d19870a71864ede86e29b58991fff72
- b2sums = ea7fd8a0fd1431078f158ef3bc184b3b826290ae4fde9739e9159444e44c8ed9fb33b1419f4650977e701f8bbbddf22a16b0dfa7aa775c89e42cb54e213de146
+ b2sums = 509a60a85c9aa85325b55f3d5d2a48e8ec390d7e5b6c5486e6929a79b4a5418e0348b18ef8547f82ddca874e21576585accc559a9414f1089e923f56bc4211b9
+ b2sums = b0ce95aaf60e4a13fa19ebdb443f6be01b083b745052e649bef12184569dec07dc49cbf7f956553a6d765db536eaed03e582883d455b19c4e376bc46bba1f5d6
+ b2sums = 455db30e45e6e0266c13a9814b9be5521f37f8327a675ceb88af62b9a388b9afcf6a91e293e14d3ce52b3b19218b600bf32a88ad7c9c5f8a22bff3d1175e764a
pkgname = linux-rc
pkgdesc = The release candidate kernel and modules
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 e98361ee2b63..0855598b2932 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 920a0c337841a67dcb90f5334370c6c9f83b13ed Mon Sep 17 00:00:00 2001
+From a82fc35557cf8218de20239fb4f6661760376731 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/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
diff --git a/0002-Bluetooth-btusb-check-conditions-before-enabling-USB.patch b/0002-Bluetooth-btusb-check-conditions-before-enabling-USB.patch
index e2a11cbf7bc2..568f89b376ed 100644
--- a/0002-Bluetooth-btusb-check-conditions-before-enabling-USB.patch
+++ b/0002-Bluetooth-btusb-check-conditions-before-enabling-USB.patch
@@ -1,7 +1,7 @@
-From 26e5c7a7e7dd11cef2b7be68881c151634b7b363 Mon Sep 17 00:00:00 2001
+From 3067de41319a25466c140cf55fb1364813828a18 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Mon, 26 Jul 2021 21:02:06 +0300
-Subject: [PATCH 2/3] Bluetooth: btusb: check conditions before enabling USB
+Subject: [PATCH 2/4] Bluetooth: btusb: check conditions before enabling USB
ALT 3 for WBS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
diff --git a/0003-drm-amdgpu-handle-VCN-instances-when-harvesting.patch b/0003-drm-amdgpu-handle-VCN-instances-when-harvesting.patch
new file mode 100644
index 000000000000..d921f0e2ddab
--- /dev/null
+++ b/0003-drm-amdgpu-handle-VCN-instances-when-harvesting.patch
@@ -0,0 +1,61 @@
+From 1132186766e4a51b1a742ab13618f7152414d352 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Mon, 9 Aug 2021 11:22:20 -0400
+Subject: [PATCH 3/4] drm/amdgpu: handle VCN instances when harvesting
+
+There may be multiple instances an only one is harvested.
+
+Fixes: 83a0b8639185 ("drm/amdgpu: add judgement when add ip blocks (v2)")
+Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1673
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+index e1b6f5891759..73f45f2e7fc4 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+@@ -299,6 +299,9 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev)
+ ip->major, ip->minor,
+ ip->revision);
+
++ if (le16_to_cpu(ip->hw_id) == VCN_HWID)
++ adev->vcn.num_vcn_inst++;
++
+ for (k = 0; k < num_base_address; k++) {
+ /*
+ * convert the endianness of base addresses in place,
+@@ -377,7 +380,7 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
+ {
+ struct binary_header *bhdr;
+ struct harvest_table *harvest_info;
+- int i;
++ int i, vcn_harvest_count = 0;
+
+ bhdr = (struct binary_header *)adev->mman.discovery_bin;
+ harvest_info = (struct harvest_table *)(adev->mman.discovery_bin +
+@@ -389,8 +392,7 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
+
+ switch (le32_to_cpu(harvest_info->list[i].hw_id)) {
+ case VCN_HWID:
+- adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;
+- adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;
++ vcn_harvest_count++;
+ break;
+ case DMU_HWID:
+ adev->harvest_ip_mask |= AMD_HARVEST_IP_DMU_MASK;
+@@ -399,6 +401,10 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
+ break;
+ }
+ }
++ if (vcn_harvest_count == adev->vcn.num_vcn_inst) {
++ adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;
++ adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;
++ }
+ }
+
+ int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev)
+--
+2.32.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 7725aea16695..ee8ddca32cf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.13
_major=5.13
### on initial release this is null otherwise it is the current stable subversion
### ie 1,2,3 corresponding $_major.1, $_major.3 etc
-_minor=9
+_minor=10
_minorc=$((_minor+1))
### on initial release this is just $_major
_fullver=$_major.$_minor
@@ -31,18 +31,20 @@ source=(
config # the main kernel config file
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-Bluetooth-btusb-check-conditions-before-enabling-USB.patch
+ 0003-drm-amdgpu-handle-VCN-instances-when-harvesting.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-b2sums=('58c3925c8fed8af4ed475e6c56af75f9b022919d5b86a2c4646957f564af08baba3232e4dc7669197a10fbc9c3f18c6787bc816d6055e8323e69867e913c9d9e'
+b2sums=('795d2886344676676256d496fb2c4fae53b9c1a7a9f47e71aab09bce7d09e69174b799e78c516927f00c772d5c317e438ea35175d4af51e2dc246dff1c0a96aa'
'SKIP'
- 'ac535116a6c5877096b0144358fbe1140edd21ef6cd857dc4684d3da0c5c1892e055df35a69eab7dae2ab1820a3efa5ef5a6fa864969c6332ca7c7930cb77313'
+ '511c7e1cc447dfe2a0e287982d485b7071df8c242046b8e0ef1bc402adb8d1f8d375e730dbb4f94fbf6eb2a2972b1cbbd43b9935f5007710804f1ca444ac7b55'
'SKIP'
'65c2a6790e288fd7bfab74ffb5a93c91ae880d699338852ffc2059c666974fdc469ee36e0d1455f74a4c377ba749649173347af0a054328032fd866688739c04'
- 'e6df0ce8d665261cffc930e0a99023abd1b26caf1e89dda756cf76713953e6b3a36d3210a4c01beedb2a28acc357a9880d19870a71864ede86e29b58991fff72'
- 'ea7fd8a0fd1431078f158ef3bc184b3b826290ae4fde9739e9159444e44c8ed9fb33b1419f4650977e701f8bbbddf22a16b0dfa7aa775c89e42cb54e213de146')
+ '509a60a85c9aa85325b55f3d5d2a48e8ec390d7e5b6c5486e6929a79b4a5418e0348b18ef8547f82ddca874e21576585accc559a9414f1089e923f56bc4211b9'
+ 'b0ce95aaf60e4a13fa19ebdb443f6be01b083b745052e649bef12184569dec07dc49cbf7f956553a6d765db536eaed03e582883d455b19c4e376bc46bba1f5d6'
+ '455db30e45e6e0266c13a9814b9be5521f37f8327a675ceb88af62b9a388b9afcf6a91e293e14d3ce52b3b19218b600bf32a88ad7c9c5f8a22bff3d1175e764a')
export KBUILD_BUILD_HOST=archlinux