summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-03 21:10:28 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-03 21:10:28 -0700
commitd1470e61ddea5d7a31e79baef2b2c77e72272b13 (patch)
tree43715feb2d34823dedadf08af70ed688a3ea274b
parentUpdated to 5.14.8 (diff)
downloadlinux-d1470e61ddea5d7a31e79baef2b2c77e72272b13.tar.xz
Updated to 5.14.9
-rw-r--r--0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch23
-rw-r--r--PKGBUILD7
2 files changed, 28 insertions, 2 deletions
diff --git a/0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch b/0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch
new file mode 100644
index 0000000..4275477
--- /dev/null
+++ b/0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch
@@ -0,0 +1,23 @@
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+@@ -422,6 +422,9 @@ int amdgpu_debugfs_ring_init(struct amdgpu_device *adev,
+ struct dentry *ent, *root = minor->debugfs_root;
+ char name[32];
+
++if (IS_ERR(root))
++ return 0;
++
+ sprintf(name, "amdgpu_ring_%s", ring->name);
+
+ ent = debugfs_create_file(name,
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+@@ -2382,6 +2382,8 @@ void amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)
+ struct drm_minor *minor = adev_to_drm(adev)->primary;
+ struct dentry *root = minor->debugfs_root;
+
++ if (IS_ERR(root))
++ return;
+ debugfs_create_file_size("amdgpu_vram", 0444, root, adev,
+ &amdgpu_ttm_vram_fops, adev->gmc.mc_vram_size);
+ debugfs_create_file("amdgpu_iomem", 0444, root, adev,
diff --git a/PKGBUILD b/PKGBUILD
index 54447dd..7af13b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _custom=0
pkgbase=linux
_supver=5
_majver=14
-_minver=8
+_minver=9
_gccpatchver='20210914'
_gccpatchker='5.8-5.14'
if [ "$_minver" == "0" ]; then
@@ -47,6 +47,7 @@ source=(
0004-ALSA-pcm-Check-mmap-capability-of-runtime-dma-buffer.patch
0005-ALSA-pci-rme-Set-up-buffer-type-properly.patch
0006-ALSA-pci-cs46xx-Fix-set-up-buffer-type-properly.patch
+ 0007-Revert-block-bfq-honor-already-setup-queue-merges-root.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
@@ -56,7 +57,7 @@ validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('62d3206583c5093f8396370c3d3df9bba507562825ea4010bed7cea4b0d8d0c06fb4d2276dca2f94e40faec3180405bbe9f20143a04a54df202d17500023e694'
+b2sums=('3d3c4e64ddf53454c25a283287cfac2f8d9674e146c7fdf80d130cfa50252fc52c57ad187f47db09d134a2ea49e16bda5018c83cd7c38c6cec9bc2e27a18b751'
'SKIP'
'95a9b7e5e0412fd815bf04d73efc9edcd878005a4e2a554902d5d6343029f2744715b862d2ba6e91136f4041bf61f9a73fe9bf2c3d13079b1e7cc778455f990c'
'2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f'
@@ -65,6 +66,7 @@ b2sums=('62d3206583c5093f8396370c3d3df9bba507562825ea4010bed7cea4b0d8d0c06fb4d22
'48d1b13aab9ac4bf3edc1603291a234fb7efe78a85ff0aa72d355eda875f19d346843b0803381ca3930ceb3bf55b5c6c9f0490073e58d567d54af080e364341c'
'3aef2a0b7e2e99efda96f03215ec87ec312eeee9ae207a257c336d5995587f6105cbc1687612b0f869d6a43fefce11598568a2b99a2f1de4d5480c30ec9401b0'
'ea815b154ffe723bc01d5c2813e798a094bde6cb1ad7a62931f87745df7be51d7548e8745e8d439f0763fae850d140edac591fd99e1720a954e7f40bf56085ec'
+ '2b0b57c1db748fac39c17a043aa56f4c6abccc4e04e85256cffdded29e29d71f182752c65d120d206b48bef61e346c04b31cfef0c9492a1b09a53a3778fdfb85'
'd1c083f96f645679c5214e05f906b47f17ac6a8b3dd2faeb219e3ceda3a008e3fe47c4a79b0345978cec5c5e28da9b20727970cf5c788d52c3782dc5b36aa211'
'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a')
@@ -92,6 +94,7 @@ prepare() {
patch -p1 -i ../0004-ALSA-pcm-Check-mmap-capability-of-runtime-dma-buffer.patch
patch -p1 -i ../0005-ALSA-pci-rme-Set-up-buffer-type-properly.patch
patch -p1 -i ../0006-ALSA-pci-cs46xx-Fix-set-up-buffer-type-properly.patch
+ patch -p1 -i ../0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch
# graysky gcc patch