diff options
| -rw-r--r-- | 0002-Bluetooth-btusb-check-conditions-before-enabling-USB-ALT-3-for-WBS.patch | 49 | ||||
| -rw-r--r-- | 0003-drm-amdgpu-return-early-on-NULL-debugfs-root.patch | 23 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
3 files changed, 28 insertions, 54 deletions
diff --git a/0002-Bluetooth-btusb-check-conditions-before-enabling-USB-ALT-3-for-WBS.patch b/0002-Bluetooth-btusb-check-conditions-before-enabling-USB-ALT-3-for-WBS.patch deleted file mode 100644 index 7aa972f..0000000 --- a/0002-Bluetooth-btusb-check-conditions-before-enabling-USB-ALT-3-for-WBS.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 6d23308119d1..5cec719f6cba 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -516,6 +516,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { - #define BTUSB_HW_RESET_ACTIVE 12 - #define BTUSB_TX_WAIT_VND_EVT 13 - #define BTUSB_WAKEUP_DISABLE 14 -+#define BTUSB_ALT3_OK_FOR_WBS 15 - - struct btusb_data { - struct hci_dev *hdev; -@@ -1748,16 +1749,20 @@ static void btusb_work(struct work_struct *work) - /* Bluetooth USB spec recommends alt 6 (63 bytes), but - * many adapters do not support it. Alt 1 appears to - * work for all adapters that do not have alt 6, and -- * which work with WBS at all. -+ * which work with WBS at all. Some devices prefer -+ * alt 3 (HCI payload >= 60 Bytes let air packet -+ * data satisfy 60 bytes), requiring -+ * MTU >= 3 (packets) * 25 (size) - 3 (headers) = 72 -+ * see also Core spec 5, vol 4, B 2.1.1 & Table 2.1. - */ -- new_alts = btusb_find_altsetting(data, 6) ? 6 : 1; -- /* Because mSBC frames do not need to be aligned to the -- * SCO packet boundary. If support the Alt 3, use the -- * Alt 3 for HCI payload >= 60 Bytes let air packet -- * data satisfy 60 bytes. -- */ -- if (new_alts == 1 && btusb_find_altsetting(data, 3)) -+ if (btusb_find_altsetting(data, 6)) -+ new_alts = 6; -+ else if (test_bit(BTUSB_ALT3_OK_FOR_WBS, &data->flags) && -+ hdev->sco_mtu >= 72 && -+ btusb_find_altsetting(data, 3)) - new_alts = 3; -+ else -+ new_alts = 1; - } - - if (btusb_switch_alt_setting(hdev, new_alts) < 0) -@@ -4733,6 +4738,7 @@ static int btusb_probe(struct usb_interface *intf, - * (DEVICE_REMOTE_WAKEUP) - */ - set_bit(BTUSB_WAKEUP_DISABLE, &data->flags); -+ set_bit(BTUSB_ALT3_OK_FOR_WBS, &data->flags); - } - - if (!reset) diff --git a/0003-drm-amdgpu-return-early-on-NULL-debugfs-root.patch b/0003-drm-amdgpu-return-early-on-NULL-debugfs-root.patch new file mode 100644 index 0000000..4275477 --- /dev/null +++ b/0003-drm-amdgpu-return-early-on-NULL-debugfs-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, @@ -18,7 +18,7 @@ _custom=0 pkgbase=linux _supver=5 _majver=13 -_minver=13 +_minver=14 _gccpatchver='20210610' _gccpatchger='10' _gccpatchker='5.8' @@ -43,7 +43,7 @@ source=( https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign} 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-return-early-on-NULL-debugfs-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 @@ -53,11 +53,11 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -b2sums=('c763adef68a11c42a6e9435522300c5327a9dd3c8b25f1c41e0fdc536e224aac83dbb13d86bb52973304520f1cc28c4c9158baddf6087af54b1e5fbe010be485' +b2sums=('5def9187bca9597fbb8097d69f5dad3cf6aa446d6fb86c0e56cfd241fc56175412d5e8f326918368cb62a98f7af6b0f7c2e75f90ab5d84708880cd097baae48b' 'SKIP' '0841ae78da6885e741c1256a28794a01cb91535f5f6428dc292c0774a7a3f3c6ffc1c6f1c5a94a13b6acb49bf2096c2c95c3654fa7a2438286e88d26c22424e2' '2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f' - 'c497d6717fab11b03bccb4649ffadb5bae2bf3be72645c2d8b7bae7d73451ab3dbcfecd151d1cce9d3907a17838705bed8baa495d1bb40c59a482fabb879c763' + '2b0b57c1db748fac39c17a043aa56f4c6abccc4e04e85256cffdded29e29d71f182752c65d120d206b48bef61e346c04b31cfef0c9492a1b09a53a3778fdfb85' '30d1df754608bb423cbc99c2097ad521baa091b9a3b39df4bd5c2d50c57eec54d8fa0e4a4a04b847c3d1b87ba682cadc8db45fabeefdc9ad7caaf8e77b96e41a' 'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a') @@ -80,7 +80,7 @@ prepare() { # Hotfixes 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-return-early-on-NULL-debugfs-root.patch # graysky gcc patch |