summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO26
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch4
-rw-r--r--0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch38
-rw-r--r--0002-efi-libstub-Fix-path-separator-regression.patch54
-rw-r--r--0003-ALSA-usb-audio-Fix-packet-size-calculation.patch35
-rw-r--r--0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch43
-rw-r--r--PKGBUILD16
7 files changed, 143 insertions, 73 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 51a8d99e5f20..25fc1f607d22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-ck
- pkgver = 5.7.6
- pkgrel = 2
+ pkgver = 5.7.7
+ pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
@@ -8,25 +8,29 @@ pkgbase = linux-ck
makedepends = kmod
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.6.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.6.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.7.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.7.tar.sign
source = config
source = 0000-sphinx-workaround.patch
source = enable_additional_cpu_optimizations-20200615.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200615.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.7/5.7-ck1/patch-5.7-ck1.xz
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = 0002-efi-libstub-Fix-path-separator-regression.patch
+ source = 0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
+ source = 0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
+ source = 0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch
source = unfuck-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 9fd4c93dc6df53efa904134aa2ede6100f7453c11383490dd32ebbed84f610e6
+ sha256sums = f840b9679283343c165516585c3070ebb277528721c890e9410a58e9d071ee7f
sha256sums = SKIP
sha256sums = ed60b20ee841e16038da0d145fbf3f53fac94122c4001d6cd03abe64e9e760f6
sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = 278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90
sha256sums = e4a201e984cf229b66fbab713c49fa3a0e0e8f238f2216e503f9452a7a7a5e06
- sha256sums = 2fd54c37df600221909e9af84cecae85b843913fb0e206e5f996a43c40d2dcc8
- sha256sums = de7ad8b9b265dbb70daddd49943ddb06799b491dbb53dce50540a840191f3f4b
+ sha256sums = 1716e59693757f339fda588b268ff6f5edc3f2ad61bbe8a61832692572e25b1a
+ sha256sums = 040420a533f7024b49633c4cf397ec95e9c915827e6230abe99890fcd769b009
+ sha256sums = 97a961d9394fcfed39986798432a4170a8dd460d26eeef4c992810f1680e7f9c
+ sha256sums = cf50d4a3f343074bfacca9b148df7b034c15732057ada962fb73c94d80bb1229
sha256sums = 5a08ac04975fe784d16d6c8ec2be733c73cdcfc19795f5c7b97d7a1aa7f12328
pkgname = linux-ck
@@ -36,11 +40,11 @@ pkgname = linux-ck
depends = initramfs
optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices
- provides = linux-ck=5.7.6
+ provides = linux-ck=5.7.7
pkgname = linux-ck-headers
pkgdesc = Headers and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=5.7.6
- provides = linux-headers=5.7.6
+ provides = linux-ck-headers=5.7.7
+ provides = linux-headers=5.7.7
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 f819c30bdf6d..69b4fe4e2e43 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 77c07a8d6f12681914e8b6f0c709d45d8c2114b1 Mon Sep 17 00:00:00 2001
+From a62bbaf1ba0f5e2c498fa9b3ae295aa166d4bb8e 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/5] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
diff --git a/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch b/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
new file mode 100644
index 000000000000..5d0c5c5ca6d8
--- /dev/null
+++ b/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
@@ -0,0 +1,38 @@
+From 6535fe9061b6f1ce76ac658ae34b85fb3ed38ad9 Mon Sep 17 00:00:00 2001
+From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
+Date: Wed, 15 Apr 2020 17:38:32 -0700
+Subject: [PATCH 2/5] PCI/EDR: Log only ACPI_NOTIFY_DISCONNECT_RECOVER events
+
+Previously we logged *all* ACPI SYSTEM-level events, which may include lots
+of non-EDR events. Move the message so we only log those related to EDR.
+
+Link: https://lore.kernel.org/r/01afb4e01efbe455de0c445bef6cf3ffc59340d2.1586996350.git.sathyanarayanan.kuppuswamy@linux.intel.com
+[bhelgaas: drop the pci_dbg() of all events since ACPI can log those
+already]
+Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+---
+ drivers/pci/pcie/edr.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/pci/pcie/edr.c b/drivers/pci/pcie/edr.c
+index 594622a6cb16..a6b9b479b97a 100644
+--- a/drivers/pci/pcie/edr.c
++++ b/drivers/pci/pcie/edr.c
+@@ -148,11 +148,11 @@ static void edr_handle_event(acpi_handle handle, u32 event, void *data)
+ pci_ers_result_t estate = PCI_ERS_RESULT_DISCONNECT;
+ u16 status;
+
+- pci_info(pdev, "ACPI event %#x received\n", event);
+-
+ if (event != ACPI_NOTIFY_DISCONNECT_RECOVER)
+ return;
+
++ pci_info(pdev, "EDR event received\n");
++
+ /* Locate the port which issued EDR event */
+ edev = acpi_dpc_port_get(pdev);
+ if (!edev) {
+--
+2.27.0
+
diff --git a/0002-efi-libstub-Fix-path-separator-regression.patch b/0002-efi-libstub-Fix-path-separator-regression.patch
deleted file mode 100644
index fc504dbc4448..000000000000
--- a/0002-efi-libstub-Fix-path-separator-regression.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 2eff8033714ddf05bb2fe52003921af8c8839ed2 Mon Sep 17 00:00:00 2001
-From: Philipp Fent <fent@in.tum.de>
-Date: Mon, 15 Jun 2020 13:51:09 +0200
-Subject: [PATCH 2/3] efi/libstub: Fix path separator regression
-
-Commit 9302c1bb8e47 ("efi/libstub: Rewrite file I/O routine") introduced a
-regression that made a couple of (badly configured) systems fail to
-boot [1]: Until 5.6, we silently accepted Unix-style file separators in
-EFI paths, which might violate the EFI standard, but are an easy to make
-mistake. This fix restores the pre-5.7 behaviour.
-
-[1] https://bbs.archlinux.org/viewtopic.php?id=256273
-
-Fixes: 9302c1bb8e47 ("efi/libstub: Rewrite file I/O routine")
-Signed-off-by: Philipp Fent <fent@in.tum.de>
-Link: https://lore.kernel.org/r/20200615115109.7823-1-fent@in.tum.de
-[ardb: rewrite as chained if/else statements]
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
----
- drivers/firmware/efi/libstub/file.c | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/firmware/efi/libstub/file.c b/drivers/firmware/efi/libstub/file.c
-index ea66b1f16a79..f1c4faf58c76 100644
---- a/drivers/firmware/efi/libstub/file.c
-+++ b/drivers/firmware/efi/libstub/file.c
-@@ -104,12 +104,20 @@ static int find_file_option(const efi_char16_t *cmdline, int cmdline_len,
- if (!found)
- return 0;
-
-+ /* Skip any leading slashes */
-+ while (cmdline[i] == L'/' || cmdline[i] == L'\\')
-+ i++;
-+
- while (--result_len > 0 && i < cmdline_len) {
-- if (cmdline[i] == L'\0' ||
-- cmdline[i] == L'\n' ||
-- cmdline[i] == L' ')
-+ efi_char16_t c = cmdline[i++];
-+
-+ if (c == L'\0' || c == L'\n' || c == L' ')
- break;
-- *result++ = cmdline[i++];
-+ else if (c == L'/')
-+ /* Replace UNIX dir separators with EFI standard ones */
-+ *result++ = L'\\';
-+ else
-+ *result++ = c;
- }
- *result = L'\0';
- return i;
---
-2.27.0
-
diff --git a/0003-ALSA-usb-audio-Fix-packet-size-calculation.patch b/0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
new file mode 100644
index 000000000000..78649ca37b6a
--- /dev/null
+++ b/0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
@@ -0,0 +1,35 @@
+From 17c5f7dd425becd30c4a2dafaecb054641a1fdc9 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Mon, 29 Jun 2020 05:59:33 +0300
+Subject: [PATCH 3/5] ALSA: usb-audio: Fix packet size calculation
+
+Commit f0bd62b64016 ("ALSA: usb-audio: Improve frames size computation")
+introduced a regression for devices which have playback endpoints with
+bInterval > 1. Fix this by taking ep->datainterval into account.
+
+Note that frame and fps are actually mean packet and packets per second
+in the code introduces by the mentioned commit. This will be fixed in a
+follow-up patch.
+
+Fixes: f0bd62b64016 ("ALSA: usb-audio: Improve frames size computation")
+BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=208353
+Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
+---
+ sound/usb/endpoint.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
+index 9bea7d3f99f8..11f23778f0a5 100644
+--- a/sound/usb/endpoint.c
++++ b/sound/usb/endpoint.c
+@@ -1093,6 +1093,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
+ ep->freqn = get_usb_high_speed_rate(rate);
+ ep->fps = 8000;
+ }
++ ep->fps >>= ep->datainterval;
+
+ ep->sample_rem = rate % ep->fps;
+ ep->framesize[0] = rate / ep->fps;
+--
+2.27.0
+
diff --git a/0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch b/0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch
new file mode 100644
index 000000000000..a1acdd3d2e53
--- /dev/null
+++ b/0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch
@@ -0,0 +1,43 @@
+From 7fab9d4206e54d19b578c70cd0529045ad642f25 Mon Sep 17 00:00:00 2001
+From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+Date: Mon, 29 Jun 2020 13:03:52 -0400
+Subject: [PATCH 4/5] drm/amd/display: Only revalidate bandwidth on medium and
+ fast updates
+
+[Why]
+Changes that are fast don't require updating DLG parameters making
+this call unnecessary. Considering this is an expensive call it should
+not be done on every flip.
+
+[How]
+Guard the validation to only happen if update type isn't FAST.
+
+Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index 4acaf4be8a81..c825d383f0f1 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -2533,10 +2533,12 @@ void dc_commit_updates_for_stream(struct dc *dc,
+
+ copy_stream_update_to_stream(dc, context, stream, stream_update);
+
+- if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
+- DC_ERROR("Mode validation failed for stream update!\n");
+- dc_release_state(context);
+- return;
++ if (update_type > UPDATE_TYPE_FAST) {
++ if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
++ DC_ERROR("Mode validation failed for stream update!\n");
++ dc_release_state(context);
++ return;
++ }
+ }
+
+ commit_planes_for_stream(
+--
+2.27.0
+
diff --git a/PKGBUILD b/PKGBUILD
index ee9021b7622c..120c40a00bdc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,8 +64,8 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.7.6
-pkgrel=2
+pkgver=5.7.7
+pkgrel=1
_ckpatchversion=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -83,21 +83,25 @@ source=(
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
"http://ck.kolivas.org/patches/5.0/5.7/5.7-ck${_ckpatchversion}/$_ckpatch.xz"
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- 0002-efi-libstub-Fix-path-separator-regression.patch
+ 0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
+ 0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
+ 0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch
"unfuck-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch"
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('9fd4c93dc6df53efa904134aa2ede6100f7453c11383490dd32ebbed84f610e6'
+sha256sums=('f840b9679283343c165516585c3070ebb277528721c890e9410a58e9d071ee7f'
'SKIP'
'ed60b20ee841e16038da0d145fbf3f53fac94122c4001d6cd03abe64e9e760f6'
'8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
'278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90'
'e4a201e984cf229b66fbab713c49fa3a0e0e8f238f2216e503f9452a7a7a5e06'
- '2fd54c37df600221909e9af84cecae85b843913fb0e206e5f996a43c40d2dcc8'
- 'de7ad8b9b265dbb70daddd49943ddb06799b491dbb53dce50540a840191f3f4b'
+ '1716e59693757f339fda588b268ff6f5edc3f2ad61bbe8a61832692572e25b1a'
+ '040420a533f7024b49633c4cf397ec95e9c915827e6230abe99890fcd769b009'
+ '97a961d9394fcfed39986798432a4170a8dd460d26eeef4c992810f1680e7f9c'
+ 'cf50d4a3f343074bfacca9b148df7b034c15732057ada962fb73c94d80bb1229'
'5a08ac04975fe784d16d6c8ec2be733c73cdcfc19795f5c7b97d7a1aa7f12328')
export KBUILD_BUILD_HOST=archlinux