Updated to 5.13.10

2 files changed, 66 insertions, 2 deletions

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 0000000..7c2fa2a
--- /dev/null
+++ b/0003-drm-amdgpu-handle-VCN-instances-when-harvesting.patch
@@ -0,0 +1,61 @@
+From 53ee065f03e3a86e189fdcfb563d9be505d90bb1 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] 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 43e7b61d1c5c..ada7bc19118a 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,
+@@ -385,7 +388,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 +
+@@ -397,8 +400,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;
+@@ -407,6 +409,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.31.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 96a7470..5b3f1a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _custom=0
 pkgbase=linux
 _supver=5
 _majver=13
-_minver=9
+_minver=10
 _gccpatchver='20210610'
 _gccpatchger='10'
 _gccpatchker='5.8'
@@ -44,6 +44,7 @@ source=(
   config         # the main kernel config file
   ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-Bluetooth-btusb-check-conditions-before-enabling-USB-ALT-3-for-WBS.patch
+  0003-drm-amdgpu-handle-VCN-instances-when-harvesting.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
@@ -53,11 +54,12 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('ac535116a6c5877096b0144358fbe1140edd21ef6cd857dc4684d3da0c5c1892e055df35a69eab7dae2ab1820a3efa5ef5a6fa864969c6332ca7c7930cb77313'
+b2sums=('511c7e1cc447dfe2a0e287982d485b7071df8c242046b8e0ef1bc402adb8d1f8d375e730dbb4f94fbf6eb2a2972b1cbbd43b9935f5007710804f1ca444ac7b55'
         'SKIP'
         '430eef5956041b75cde1936477cadc08f9d2a63431e1a7ff41b7b17b879aec6b2607d2860e391b235ba2cc403c4dcc77d2d5ba5035fa72e5bb94d26deb41a389'
         '2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f'
         'c497d6717fab11b03bccb4649ffadb5bae2bf3be72645c2d8b7bae7d73451ab3dbcfecd151d1cce9d3907a17838705bed8baa495d1bb40c59a482fabb879c763'
+        '8b7418f4bbe024382011b79455c185ec3ae8fba6f1186c77a9a215954313dd51ebead4d5d3ec478795ceedcbdaa9cbe17fd80ebf2465b02cfc8b1912a6b333b1'
         '30d1df754608bb423cbc99c2097ad521baa091b9a3b39df4bd5c2d50c57eec54d8fa0e4a4a04b847c3d1b87ba682cadc8db45fabeefdc9ad7caaf8e77b96e41a'
         'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a')
@@ -81,6 +83,7 @@ prepare() {
   echo "Applying hotfixes"
   patch -p1 -i ../ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   patch -p1 -i ../0002-Bluetooth-btusb-check-conditions-before-enabling-USB-ALT-3-for-WBS.patch
+  patch -p1 -i ../0003-drm-amdgpu-handle-VCN-instances-when-harvesting.patch
 
 
   # graysky gcc patch