diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch | 60 | ||||
| -rw-r--r-- | 0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk.patch | 44 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
4 files changed, 10 insertions, 122 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 5.4.5 + pkgver = 5.4.6 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -9,8 +9,8 @@ pkgbase = linux-ck makedepends = bc makedepends = libelf options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.5.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.5.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.6.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.6.tar.sign source = config source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz source = http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz @@ -20,11 +20,9 @@ pkgbase = linux-ck source = 0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch source = 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch source = 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch - source = 0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch - source = 0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = 568e9f27fbba86131c2e2849f296d54216e2ed3e8c4d8aa78a93b417cab23ec0 + sha256sums = fda561bcdea397ddd59656319c53871002938b19b554f30efed90affa30989c8 sha256sums = SKIP sha256sums = 5d58a2115892839997ae7dcca226697c34b656de7685cb3eb8696451dc5100a0 sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5 @@ -35,8 +33,6 @@ pkgbase = linux-ck sha256sums = 8496a9be2c3b2e3cefa292d00d3f43a4e7c3b03c4508f9d38a6b21fa4684240d sha256sums = e5a3ed9c900b7e69cec1090ff76171a1c00cf723a2fa9a07fdf95c194ef3738b sha256sums = 760b60334eff05b1ef20c800fdb1e2ff6c7f9264f5e5c396f644720a824a92d7 - sha256sums = 38c670bb8b9efaae54217a09b118d8b55ef183df134ae94f643d6e8e1ad6ac70 - sha256sums = bc0d303b6f2e8a518414ff706322a39b460ae3acdbb5b0c3488e35794227d69a pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler @@ -45,11 +41,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.4.5 + provides = linux-ck=5.4.6 pkgname = linux-ck-headers pkgdesc = Headers and scripts for building modules for Linux-ck kernel depends = linux-ck - provides = linux-ck-headers=5.4.5 - provides = linux-headers=5.4.5 + provides = linux-ck-headers=5.4.6 + provides = linux-headers=5.4.6 diff --git a/0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch b/0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch deleted file mode 100644 index 33bee3279a4a..000000000000 --- a/0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 04fe3cc1f00622bf3ff356dca7f122768a14bdbc Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Sat, 14 Dec 2019 18:52:17 +0100 -Subject: [PATCH 7/9] ALSA: hda: Fix regression by strip mask fix - -The commit e38e486d66e2 ("ALSA: hda: Modify stream stripe mask only -when needed") tried to address the regression by the unconditional -application of the stripe mask, but this caused yet another -regression for the previously working devices. Namely, the patch -clears the azx_dev->stripe flag at snd_hdac_stream_clear(), but this -may be called multiple times before restarting the stream, so this -ended up with clearance of the flag for the whole time. - -This patch fixes the regression by moving the azx_dev->stripe flag -clearance at the counter-part, the close callback of HDMI codec -driver instead. - -Fixes: e38e486d66e2 ("ALSA: hda: Modify stream stripe mask only when needed") -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=205855 -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204477 -Cc: <stable@vger.kernel.org> -Link: https://lore.kernel.org/r/20191214175217.31852-1-tiwai@suse.de -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - sound/hda/hdac_stream.c | 4 +--- - sound/pci/hda/patch_hdmi.c | 2 ++ - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c -index f9707fb05efe..682ed39f79b0 100644 ---- a/sound/hda/hdac_stream.c -+++ b/sound/hda/hdac_stream.c -@@ -120,10 +120,8 @@ void snd_hdac_stream_clear(struct hdac_stream *azx_dev) - snd_hdac_stream_updateb(azx_dev, SD_CTL, - SD_CTL_DMA_START | SD_INT_MASK, 0); - snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */ -- if (azx_dev->stripe) { -+ if (azx_dev->stripe) - snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0); -- azx_dev->stripe = 0; -- } - azx_dev->running = false; - } - EXPORT_SYMBOL_GPL(snd_hdac_stream_clear); -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 4dafc864d765..488c17c9f375 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -1983,6 +1983,8 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo, - per_cvt->assigned = 0; - hinfo->nid = 0; - -+ azx_stream(get_azx_dev(substream))->stripe = 0; -+ - mutex_lock(&spec->pcm_lock); - snd_hda_spdif_ctls_unassign(codec, pcm_idx); - clear_bit(pcm_idx, &spec->pcm_in_use); --- -2.24.1 - diff --git a/0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk.patch b/0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk.patch deleted file mode 100644 index 1c074e3f1475..000000000000 --- a/0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1960609cc201fd1c99c17cade6956de06b3d3856 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> -Date: Wed, 27 Nov 2019 22:12:09 +0200 -Subject: [PATCH 8/9] drm/i915/fbc: Disable fbc by default on all glk+ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We're missing a workaround in the fbc code for all glk+ platforms -which can cause corruption around the top of the screen. So -enabling fbc by default is a bad idea. I'm not keen to backport -the w/a so let's start by disabling fbc by default on all glk+. -We'll lift the restriction once the w/a is in place. - -Cc: stable@vger.kernel.org -Cc: Daniel Drake <drake@endlessm.com> -Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> -Cc: Jian-Hong Pan <jian-hong@endlessm.com> -Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> -Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Link: https://patchwork.freedesktop.org/patch/msgid/20191127201222.16669-2-ville.syrjala@linux.intel.com -Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> -(cherry picked from commit cd8c021b36a66833cefe2c90a79a9e312a2a5690) -Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> ---- - drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c -index 16ed44bfd734..07a038f21619 100644 ---- a/drivers/gpu/drm/i915/display/intel_fbc.c -+++ b/drivers/gpu/drm/i915/display/intel_fbc.c -@@ -1284,7 +1284,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *dev_priv) - return 0; - - /* https://bugs.freedesktop.org/show_bug.cgi?id=108085 */ -- if (IS_GEMINILAKE(dev_priv)) -+ if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) - return 0; - - if (IS_BROADWELL(dev_priv) || INTEL_GEN(dev_priv) >= 9) --- -2.24.1 - @@ -61,7 +61,7 @@ _localmodcfg= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -_srcver=5.4.5-arch1 +_srcver=5.4.6-arch1 pkgver=${_srcver%-*} pkgrel=1 _ckpatchversion=1 @@ -83,14 +83,12 @@ source=( 0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch - 0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch - 0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('568e9f27fbba86131c2e2849f296d54216e2ed3e8c4d8aa78a93b417cab23ec0' +sha256sums=('fda561bcdea397ddd59656319c53871002938b19b554f30efed90affa30989c8' 'SKIP' '5d58a2115892839997ae7dcca226697c34b656de7685cb3eb8696451dc5100a0' '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' @@ -100,9 +98,7 @@ sha256sums=('568e9f27fbba86131c2e2849f296d54216e2ed3e8c4d8aa78a93b417cab23ec0' 'f922696f10cfbe7e5b0a95fb3d9333006d63a1c4dbfc280ae3b5d10c8c7208fb' '8496a9be2c3b2e3cefa292d00d3f43a4e7c3b03c4508f9d38a6b21fa4684240d' 'e5a3ed9c900b7e69cec1090ff76171a1c00cf723a2fa9a07fdf95c194ef3738b' - '760b60334eff05b1ef20c800fdb1e2ff6c7f9264f5e5c396f644720a824a92d7' - '38c670bb8b9efaae54217a09b118d8b55ef183df134ae94f643d6e8e1ad6ac70' - 'bc0d303b6f2e8a518414ff706322a39b460ae3acdbb5b0c3488e35794227d69a') + '760b60334eff05b1ef20c800fdb1e2ff6c7f9264f5e5c396f644720a824a92d7') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase |