summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-01-17 12:54:14 -0500
committergraysky2020-01-17 12:54:14 -0500
commit133d7c495758e77d3173452c0eaf56c9c0f825ba (patch)
tree6d854ce53ca8365157be6786f8325fdcb00b79d6
parentfd2cfa9c92fecf35b7a71b7204ce99051a0f3da2 (diff)
downloadaur-133d7c495758e77d3173452c0eaf56c9c0f825ba.tar.gz
Update to 5.4.13rc1-1
-rw-r--r--.SRCINFO44
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch8
-rw-r--r--0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch4
-rw-r--r--0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch4
-rw-r--r--0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch4
-rw-r--r--0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch4
-rw-r--r--0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch4
-rw-r--r--0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch4
-rw-r--r--0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch8
-rw-r--r--0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch8
-rw-r--r--0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch4
-rw-r--r--0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch64
-rw-r--r--0011-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch129
-rw-r--r--0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch4
-rw-r--r--0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch4
-rw-r--r--0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch4
-rw-r--r--PKGBUILD39
17 files changed, 137 insertions, 203 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08a0b5fc561..de10362b76a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.4.12rc1
+ pkgver = 5.4.13rc1
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -9,10 +9,10 @@ pkgbase = linux-rc
makedepends = bc
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.12-rc1.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.12-rc1.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.11.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.11.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.13-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.13-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.12.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.12.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = 0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
@@ -24,31 +24,31 @@ pkgbase = linux-rc
source = 0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
source = 0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
source = 0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
- source = 0011-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+ source = 0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
source = 0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
source = 0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
source = 0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 6ef7160af214d1eb6fe14a61a227ef011ac3b4cf29788022ab0c45ba2108e9b4
+ sha256sums = 9bae8b2f674152e4d126a505d1e89958b5de735791ebb7d321e436ff767990f3
sha256sums = SKIP
- sha256sums = 62bd36e5d5e1d8208750ccddd8e8aa3d109b29b5ac5344b5b1c47d0f6d55d72c
+ sha256sums = d9c3c7a2d52d25c24cbca0f89d55511422d3d207c573d42ec58f7f17c948d0fb
sha256sums = SKIP
sha256sums = eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31
- sha256sums = 632dd5b285217ad7f6ec584ace623a178c38debdc278c2063feb11412e6fabf8
- sha256sums = 8140032dcd5bcfd20b9758afe9937816a5eb0a9e700e45f309eb35f6b082719c
- sha256sums = ff5756e69a9e6d882e35bd3a73bb158601b0bfaa14a8bcc5bffcdcd39e20dde7
- sha256sums = c9dc80e6d5c5dc71631c33e27e2d4cab69aff6dfa7be17df84a133c6755315c4
- sha256sums = 988365ce8140d48e0691bb49f0a8b629228936963251f8c02ff783ecd024d283
- sha256sums = d9eeb20c3f1727377e75ca610707f28a2deb4b3fa649da34d39990e24c465cdc
- sha256sums = ef375c26e0094879481900bdf62ffa9db1f27c9a0426fdc1e032a2816052e800
- sha256sums = 3c87892910935b3f93b462b3a3aec162951e05fc951839a4203da1f07a591528
- sha256sums = b4bcf8f820e761c64574a8396ede69254e0d693bab9ca98f65c9c7b274b318c7
- sha256sums = b470273d4ade5355b12556a0a3fb9524a872b0d3409f5bc29aa4eda81e2244e1
- sha256sums = 408e7d10477c67a74780baf0b69d7d09c4c53866e914bf736a7745db5b36fab0
- sha256sums = b98de2658ef5f62190a22ebc886b7b1bd7741e48d3aa77b24fc3b0dc1dba380b
- sha256sums = 532c33ea21ecdcd3826f2beab60d58679a8fb93d3c7143f0f3cef1604d3e07cc
- sha256sums = 2e72e164cdffa2a67d1ce341a8c10cdee857830d670f0b5b2905992a21ebbb5f
+ sha256sums = 9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee
+ sha256sums = 0ee10a8bce75e243f20dcae2bf627325a65b0a725fc4af70b585e170a4c5b984
+ sha256sums = 1bc6c7503d5e30196ccb2210bbd9d17d73c245afa82a671d4ccf14796047cca6
+ sha256sums = 4dddac706c4983bd9ddd67aafc08d4b17d0cd9d929be14d92586dfacdb0f37fb
+ sha256sums = 66a5cdff9a5a83d4f691f38b18a06bf373c32be9200ca8708eddde560fc8f33d
+ sha256sums = 4073da89517a8e25ceb63c686c0f4b5a3988ad91d4bfa7977a508e6f41dd56da
+ sha256sums = d32cca150a2ccb9e5b144769e75ef7a7b851f3cd4a8357c1cd8e6a9f5eac6f31
+ sha256sums = 44ddfe0a758b2019bfc1bab5a20eabf93169c7e8752229b21b586501417e6ba7
+ sha256sums = 5d015f7c3531ca1b71af816f61f7ebe136aea27d9e512428b63d900a62ff1da7
+ sha256sums = 14d906805171e5dd48e68554211f1f16ed11072cd7e53a64b072966c55cedd4f
+ sha256sums = 1723977a803dbccaab2304ea40f709f4a6dea8e14b13208563b0258a1928fa61
+ sha256sums = de47a6abdd33b662002016d384ea173c524dc8992c28ef6e2aca5d46141e6171
+ sha256sums = 1cc21b1d55521e812b498d345e39d762e294ee52d344610b08ad3a8596119dae
+ sha256sums = 75a804ea7e28b3794ce11122dd4fcf80652e115ee7f3b785f8f7853fd7869881
pkgname = linux-rc
pkgdesc = The release candidate kernel and modules
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 d8e07528455..5d4014a2b45 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,4 +1,4 @@
-From aa6f1974af2dfd6aa8acaefd72036a8b451d15d6 Mon Sep 17 00:00:00 2001
+From a8d736bad70d4062a14c29bdcbed71bef7b575f5 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 01/15] ZEN: Add sysctl and CONFIG to disallow unprivileged
@@ -40,7 +40,7 @@ index b4daad2bac23..362f82c5ec07 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index 6cabc124378c..fda4986da9eb 100644
+index 755d8160e001..ed909f8050b2 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -106,6 +106,11 @@
@@ -66,7 +66,7 @@ index 6cabc124378c..fda4986da9eb 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -2826,6 +2835,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -2836,6 +2845,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -128,5 +128,5 @@ index 8eadadc478f9..c36ecd19562c 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.24.1
+2.25.0
diff --git a/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch b/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
index 3cf762ce110..d12405111c3 100644
--- a/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
+++ b/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
@@ -1,4 +1,4 @@
-From 7fbd1ff7b5d08260098c55ab116c23727844d522 Mon Sep 17 00:00:00 2001
+From 1e41b685fcac38c05219030acb033a42832f7459 Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:28 -0600
Subject: [PATCH 02/15] lib: devres: add a helper function for ioremap_uc
@@ -75,5 +75,5 @@ index 6a0e9bd6524a..17624d35e82d 100644
* devm_ioremap_nocache - Managed ioremap_nocache()
* @dev: Generic device to remap IO address for
--
-2.24.1
+2.25.0
diff --git a/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch b/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
index 9bb610bb507..cd1bc9b3f6c 100644
--- a/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
+++ b/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
@@ -1,4 +1,4 @@
-From 80f53f7d91081d11ecfcc19015f93cafec59adc2 Mon Sep 17 00:00:00 2001
+From 3f0415751d3c1456d314a46d9f28053c8c2a7afa Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:29 -0600
Subject: [PATCH 03/15] mfd: intel-lpss: Use devm_ioremap_uc for MMIO
@@ -44,5 +44,5 @@ index bfe4ff337581..b0f0781a6b9c 100644
if (!lpss->priv)
return -ENOMEM;
--
-2.24.1
+2.25.0
diff --git a/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch b/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
index bc553ccb626..acf4474d77b 100644
--- a/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
+++ b/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
@@ -1,4 +1,4 @@
-From 874a41206f38028c52fb7d28d0cfcdee5febb495 Mon Sep 17 00:00:00 2001
+From ea5b8c60cd739ed3166d8c0f0cba6df6f57d271f Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Tue, 29 Oct 2019 20:00:21 +0300
Subject: [PATCH 04/15] PCI: pciehp: Do not disable interrupt twice on suspend
@@ -95,5 +95,5 @@ index b3122c151b80..56daad828c9e 100644
#endif /* PM */
};
--
-2.24.1
+2.25.0
diff --git a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch b/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
index 71df7769149..3e01de8a844 100644
--- a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+++ b/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
@@ -1,4 +1,4 @@
-From a062a328c43d18ce2f183ab3ad69e6da032feeb2 Mon Sep 17 00:00:00 2001
+From 02dc4cbf4b169ff89a2380b178e07e20eb661d62 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Tue, 29 Oct 2019 20:00:22 +0300
Subject: [PATCH 05/15] PCI: pciehp: Prevent deadlock on disconnect
@@ -268,5 +268,5 @@ index 86d97f3112f0..a2a263764ef8 100644
int pciehp_query_power_fault(struct controller *ctrl)
--
-2.24.1
+2.25.0
diff --git a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch b/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
index faa825bfa9e..cac7e7ede3e 100644
--- a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+++ b/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
@@ -1,4 +1,4 @@
-From 1706504ce96ddff9f2155467707f4e39e4f9acb1 Mon Sep 17 00:00:00 2001
+From b5ae067d036c7d621af4178bba61c8c6fa3c7850 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Thu, 28 Nov 2019 23:50:40 +0100
Subject: [PATCH 06/15] ACPI: PM: s2idle: Rework ACPI events synchronization
@@ -74,5 +74,5 @@ index 2af937a8b1c5..6747a279621b 100644
acpi_enable_all_runtime_gpes();
--
-2.24.1
+2.25.0
diff --git a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index ae734393495..5657d6c3703 100644
--- a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -1,4 +1,4 @@
-From a8225afcc3df821f990d024090fbd4e9c84900a7 Mon Sep 17 00:00:00 2001
+From 6c245b6bc1a0c4979566dbd13edcb553919010d7 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 24 Dec 2019 05:18:47 +0100
Subject: [PATCH 07/15] iwlwifi: pcie: restore support for Killer Qu C0 NICs
@@ -32,5 +32,5 @@ index b0b7eca1754e..de62a6dc4e73 100644
/* same thing for QuZ... */
--
-2.24.1
+2.25.0
diff --git a/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch b/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
index 3494205f674..bbd3e5dd57d 100644
--- a/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+++ b/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
@@ -1,4 +1,4 @@
-From bdee01bce0ddfe783308ec75e7ac164f88566863 Mon Sep 17 00:00:00 2001
+From ac55f63c14c1e7d0740c27d325e8abe40e2478b3 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Fri, 20 Sep 2019 11:39:18 +0300
Subject: [PATCH 08/15] drm/i915: save AUD_FREQ_CNTRL state at audio domain
@@ -70,10 +70,10 @@ index 89b6112bd66b..043ce1b47aeb 100644
struct {
struct mutex mutex;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index f8ee9aba3955..e1fe356463ec 100644
+index 7b6e68f082f8..a99ef18665f2 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
-@@ -9104,6 +9104,8 @@ enum {
+@@ -9110,6 +9110,8 @@ enum {
#define HSW_AUD_CHICKENBIT _MMIO(0x65f10)
#define SKL_AUD_CODEC_WAKE_SIGNAL (1 << 15)
@@ -83,5 +83,5 @@ index f8ee9aba3955..e1fe356463ec 100644
* HSW - ICL power wells
*
--
-2.24.1
+2.25.0
diff --git a/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch b/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
index 7cde1b1921c..591c4f4dd8d 100644
--- a/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+++ b/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
@@ -1,4 +1,4 @@
-From 7275786a32e9958d29e71415297038bb890bd4de Mon Sep 17 00:00:00 2001
+From 77437dba84a29da0fdf62f9946416b6e53496b1d Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 3 Oct 2019 11:55:30 +0300
Subject: [PATCH 09/15] drm/i915: Fix audio power up sequence for gen10+
@@ -40,10 +40,10 @@ index 439bc0a93410..440b33762fef 100644
return ret;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index e1fe356463ec..ccfea9c2b8bf 100644
+index a99ef18665f2..1dd7b6187780 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
-@@ -9105,6 +9105,8 @@ enum {
+@@ -9111,6 +9111,8 @@ enum {
#define SKL_AUD_CODEC_WAKE_SIGNAL (1 << 15)
#define AUD_FREQ_CNTRL _MMIO(0x65900)
@@ -53,5 +53,5 @@ index e1fe356463ec..ccfea9c2b8bf 100644
/*
* HSW - ICL power wells
--
-2.24.1
+2.25.0
diff --git a/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch b/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
index b4ca5f406dd..92108ff2e86 100644
--- a/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+++ b/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
@@ -1,4 +1,4 @@
-From ec618d435b2b6085b623acd0a31be6f6ca9f434d Mon Sep 17 00:00:00 2001
+From 466961b7872771f84a86f2304197d303ed749925 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 3 Oct 2019 11:55:31 +0300
Subject: [PATCH 10/15] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
@@ -37,5 +37,5 @@ index 440b33762fef..05ef43b13d1c 100644
intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO, cookie);
--
-2.24.1
+2.25.0
diff --git a/0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch b/0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
new file mode 100644
index 00000000000..a24c8925445
--- /dev/null
+++ b/0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
@@ -0,0 +1,64 @@
+From 238026166679e618b3bad1c86b0e37a43303b6b0 Mon Sep 17 00:00:00 2001
+From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
+Date: Tue, 31 Dec 2019 16:00:07 +0200
+Subject: [PATCH 11/15] drm/i915: Limit audio CDCLK>=2*BCLK constraint back to
+ GLK only
+
+Revert changes done in commit f6ec9483091f ("drm/i915: extend audio
+CDCLK>=2*BCLK constraint to more platforms"). Audio drivers
+communicate with i915 over HDA bus multiple times during system
+boot-up and each of these transactions result in matching
+get_power/put_power calls to i915, and depending on the platform,
+a modeset change causing visible flicker.
+
+GLK is the only platform with minimum CDCLK significantly lower
+than BCLK, and thus for GLK setting a higher CDCLK is mandatory.
+
+For other platforms, minimum CDCLK is close but below 2*BCLK
+(e.g. on ICL, CDCLK=176.4kHz with BCLK=96kHz). Spec-wise the constraint
+should be set, but in practise no communication errors have been
+reported and the downside if set is the flicker observed at boot-time.
+
+Revert to old behaviour until better mechanism to manage
+probe-time clocks is available.
+
+The full CDCLK>=2*BCLK constraint is still enforced at pipe
+enable time in intel_crtc_compute_min_cdclk().
+
+Bugzilla: https://gitlab.freedesktop.org/drm/intel/issues/913
+Fixes: f6ec9483091f ("drm/i915: extend audio CDCLK>=2*BCLK constraint to more platforms")
+Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
+Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
+Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20191231140007.31728-1-kai.vehmanen@linux.intel.com
+(cherry picked from commit 1ee48a61aa57dbdbc3cd2808d8b28df40d938e44)
+Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+---
+ drivers/gpu/drm/i915/display/intel_audio.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
+index 05ef43b13d1c..0cf475f3063c 100644
+--- a/drivers/gpu/drm/i915/display/intel_audio.c
++++ b/drivers/gpu/drm/i915/display/intel_audio.c
+@@ -858,7 +858,7 @@ static unsigned long i915_audio_component_get_power(struct device *kdev)
+ }
+
+ /* Force CDCLK to 2*BCLK as long as we need audio powered. */
+- if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
++ if (IS_GEMINILAKE(dev_priv))
+ glk_force_audio_cdclk(dev_priv, true);
+
+ if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+@@ -877,7 +877,7 @@ static void i915_audio_component_put_power(struct device *kdev,
+
+ /* Stop forcing CDCLK to 2*BCLK if no need for audio to be powered. */
+ if (--dev_priv->audio_power_refcount == 0)
+- if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
++ if (IS_GEMINILAKE(dev_priv))
+ glk_force_audio_cdclk(dev_priv, false);
+
+ intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO, cookie);
+--
+2.25.0
+
diff --git a/0011-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch b/0011-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
deleted file mode 100644
index e5fb84f15cb..00000000000
--- a/0011-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 2b2a5485e24df06dcac771fbe169e26236d2a75f Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 30 Dec 2019 11:15:30 +0000
-Subject: [PATCH 11/15] drm/i915/gt: Detect if we miss WaIdleLiteRestore
-
-In order to avoid confusing the HW, we must never submit an empty ring
-during lite-restore, that is we should always advance the RING_TAIL
-before submitting to stay ahead of the RING_HEAD.
-
-Normally this is prevented by keeping a couple of spare NOPs in the
-request->wa_tail so that on resubmission we can advance the tail. This
-relies on the request only being resubmitted once, which is the normal
-condition as it is seen once for ELSP[1] and then later in ELSP[0]. On
-preemption, the requests are unwound and the tail reset back to the
-normal end point (as we know the request is incomplete and therefore its
-RING_HEAD is even earlier).
-
-However, if this w/a should fail we would try and resubmit the request
-with the RING_TAIL already set to the location of this request's wa_tail
-potentially causing a GPU hang. We can spot when we do try and
-incorrectly resubmit without advancing the RING_TAIL and spare any
-embarrassment by forcing the context restore.
-
-In the case of preempt-to-busy, we leave the requests running on the HW
-while we unwind. As the ring is still live, we cannot rewind our
-rq->tail without forcing a reload so leave it set to rq->wa_tail and
-only force a reload if we resubmit after a lite-restore. (Normally, the
-forced reload will be a part of the preemption event.)
-
-Fixes: 22b7a426bbe1 ("drm/i915/execlists: Preempt-to-busy")
-Closes: https://gitlab.freedesktop.org/drm/intel/issues/673
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
-Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
-Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
-Cc: stable@vger.kernel.org
-Link: https://patchwork.freedesktop.org/patch/msgid/20191209023215.3519970-1-chris@chris-wilson.co.uk
-(cherry picked from commit 82c69bf58650e644c61aa2bf5100b63a1070fd2f)
----
- drivers/gpu/drm/i915/gt/intel_lrc.c | 42 ++++++++++++++---------------
- 1 file changed, 20 insertions(+), 22 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
-index d564bfcab6a3..49ce15553e7b 100644
---- a/drivers/gpu/drm/i915/gt/intel_lrc.c
-+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
-@@ -471,12 +471,6 @@ lrc_descriptor(struct intel_context *ce, struct intel_engine_cs *engine)
- return desc;
- }
-
--static void unwind_wa_tail(struct i915_request *rq)
--{
-- rq->tail = intel_ring_wrap(rq->ring, rq->wa_tail - WA_TAIL_BYTES);
-- assert_ring_tail_valid(rq->ring, rq->tail);
--}
--
- static struct i915_request *
- __unwind_incomplete_requests(struct intel_engine_cs *engine)
- {
-@@ -495,7 +489,6 @@ __unwind_incomplete_requests(struct intel_engine_cs *engine)
- continue; /* XXX */
-
- __i915_request_unsubmit(rq);
-- unwind_wa_tail(rq);
-
- /*
- * Push the request back into the queue for later resubmission.
-@@ -650,13 +643,29 @@ execlists_schedule_out(struct i915_request *rq)
- i915_request_put(rq);
- }
-
--static u64 execlists_update_context(const struct i915_request *rq)
-+static u64 execlists_update_context(struct i915_request *rq)
- {
- struct intel_context *ce = rq->hw_context;
-- u64 desc;
-+ u64 desc = ce->lrc_desc;
-+ u32 tail;
-
-- ce->lrc_reg_state[CTX_RING_TAIL + 1] =
-- intel_ring_set_tail(rq->ring, rq->tail);
-+ /*
-+ * WaIdleLiteRestore:bdw,skl
-+ *
-+ * We should never submit the context with the same RING_TAIL twice
-+ * just in case we submit an empty ring, which confuses the HW.
-+ *
-+ * We append a couple of NOOPs (gen8_emit_wa_tail) after the end of
-+ * the normal request to be able to always advance the RING_TAIL on
-+ * subsequent resubmissions (for lite restore). Should that fail us,
-+ * and we try and submit the same tail again, force the context
-+ * reload.
-+ */
-+ tail = intel_ring_set_tail(rq->ring, rq->tail);
-+ if (unlikely(ce->lrc_reg_state[CTX_RING_TAIL + 1] == tail))
-+ desc |= CTX_DESC_FORCE_RESTORE;
-+ ce->lrc_reg_state[CTX_RING_TAIL + 1] = tail;
-+ rq->tail = rq->wa_tail;
-
- /*
- * Make sure the context image is complete before we submit it to HW.
-@@ -675,7 +684,6 @@ static u64 execlists_update_context(const struct i915_request *rq)
- */
- mb();
-
-- desc = ce->lrc_desc;
- ce->lrc_desc &= ~CTX_DESC_FORCE_RESTORE;
-
- return desc;
-@@ -1150,16 +1158,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
- if (!list_is_last(&last->sched.link,
- &engine->active.requests))
- return;
--
-- /*
-- * WaIdleLiteRestore:bdw,skl
-- * Apply the wa NOOPs to prevent
-- * ring:HEAD == rq:TAIL as we resubmit the
-- * request. See gen8_emit_fini_breadcrumb() for
-- * where we prepare the padding after the
-- * end of the request.
-- */
-- last->tail = last->wa_tail;
- }
- }
-
---
-2.24.1
-
diff --git a/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch b/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
index 9a1cb519161..dab476ce6d4 100644
--- a/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+++ b/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
@@ -1,4 +1,4 @@
-From a5f880ae74a3317bc47838db8715c5b0e6fd156c Mon Sep 17 00:00:00 2001
+From c7e2526442e1a92f2c875c0300935918a295f527 Mon Sep 17 00:00:00 2001
From: Boyan Ding <boyan.j.ding@gmail.com>
Date: Wed, 1 Jan 2020 11:44:49 -0800
Subject: [PATCH 12/15] pinctrl: sunrisepoint: Add missing Interrupt Status
@@ -31,5 +31,5 @@ index 44d7f50bbc82..d936e7aa74c4 100644
.pin_base = (s), \
.npins = ((e) - (s) + 1), \
--
-2.24.1
+2.25.0
diff --git a/0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch b/0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
index 363ea9442ed..8dcb254db05 100644
--- a/0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+++ b/0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
@@ -1,4 +1,4 @@
-From bb8bf48f4e9ab555fe824358d8d01da52f7d8255 Mon Sep 17 00:00:00 2001
+From ad6657302538790fdf5c0c0f6e88add139e0c530 Mon Sep 17 00:00:00 2001
From: Mehmet Akif Tasova <makiftasova@gmail.com>
Date: Mon, 30 Dec 2019 15:48:16 +0200
Subject: [PATCH 13/15] Revert "iwlwifi: mvm: fix scan config command size"
@@ -44,5 +44,5 @@ index fcafa22ec6ce..8aa567d7912c 100644
cfg = kzalloc(cmd_size, GFP_KERNEL);
if (!cfg)
--
-2.24.1
+2.25.0
diff --git a/0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch b/0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
index 11fad4a3d95..17a717ed59e 100644
--- a/0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+++ b/0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
@@ -1,4 +1,4 @@
-From ddd410cff71ff21a64d66039f30e197314e18e23 Mon Sep 17 00:00:00 2001
+From 22aa8417725e7b4cb467a78a6bce6f23ad799d98 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sat, 4 Jan 2020 23:29:22 -0800
Subject: [PATCH 14/15] e1000e: Revert "e1000e: Make watchdog use delayed work"
@@ -170,5 +170,5 @@ index d7d56e42a6aa..060daf66bf63 100644
cancel_work_sync(&adapter->tx_hwtstamp_work);
if (adapter->tx_hwtstamp_skb) {
--
-2.24.1
+2.25.0
diff --git a/PKGBUILD b/PKGBUILD
index 404a2fbc00b..10ee9ba83cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.4
_major=5.4
### on initial release this is null otherwise it is the current stable subversion
### ie 1,2,3 corresponding $_major.1, $_major.3 etc.
-_minor=11
+_minor=12
### on initial release comment this out and set to =1
_minorc=$((_minor+1))
#_minorc=1
@@ -30,7 +30,7 @@ source=(
# "$_rcpatch.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=$_srcname.y&id2=v${_major}.${_minor}"
https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign}
config # the main kernel config file
- 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
@@ -40,35 +40,34 @@ source=(
0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
-0011-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
-
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('6ef7160af214d1eb6fe14a61a227ef011ac3b4cf29788022ab0c45ba2108e9b4'
+sha256sums=('9bae8b2f674152e4d126a505d1e89958b5de735791ebb7d321e436ff767990f3'
'SKIP'
- '62bd36e5d5e1d8208750ccddd8e8aa3d109b29b5ac5344b5b1c47d0f6d55d72c'
+ 'd9c3c7a2d52d25c24cbca0f89d55511422d3d207c573d42ec58f7f17c948d0fb'
'SKIP'
'eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31'
- '632dd5b285217ad7f6ec584ace623a178c38debdc278c2063feb11412e6fabf8'
- '8140032dcd5bcfd20b9758afe9937816a5eb0a9e700e45f309eb35f6b082719c'
- 'ff5756e69a9e6d882e35bd3a73bb158601b0bfaa14a8bcc5bffcdcd39e20dde7'
- 'c9dc80e6d5c5dc71631c33e27e2d4cab69aff6dfa7be17df84a133c6755315c4'
- '988365ce8140d48e0691bb49f0a8b629228936963251f8c02ff783ecd024d283'
- 'd9eeb20c3f1727377e75ca610707f28a2deb4b3fa649da34d39990e24c465cdc'
- 'ef375c26e0094879481900bdf62ffa9db1f27c9a0426fdc1e032a2816052e800'
- '3c87892910935b3f93b462b3a3aec162951e05fc951839a4203da1f07a591528'
- 'b4bcf8f820e761c64574a8396ede69254e0d693bab9ca98f65c9c7b274b318c7'
- 'b470273d4ade5355b12556a0a3fb9524a872b0d3409f5bc29aa4eda81e2244e1'
- '408e7d10477c67a74780baf0b69d7d09c4c53866e914bf736a7745db5b36fab0'
- 'b98de2658ef5f62190a22ebc886b7b1bd7741e48d3aa77b24fc3b0dc1dba380b'
- '532c33ea21ecdcd3826f2beab60d58679a8fb93d3c7143f0f3cef1604d3e07cc'
- '2e72e164cdffa2a67d1ce341a8c10cdee857830d670f0b5b2905992a21ebbb5f')
+ '9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee'
+ '0ee10a8bce75e243f20dcae2bf627325a65b0a725fc4af70b585e170a4c5b984'
+ '1bc6c7503d5e30196ccb2210bbd9d17d73c245afa82a671d4ccf14796047cca6'
+ '4dddac706c4983bd9ddd67aafc08d4b17d0cd9d929be14d92586dfacdb0f37fb'
+ '66a5cdff9a5a83d4f691f38b18a06bf373c32be9200ca8708eddde560fc8f33d'
+ '4073da89517a8e25ceb63c686c0f4b5a3988ad91d4bfa7977a508e6f41dd56da'
+ 'd32cca150a2ccb9e5b144769e75ef7a7b851f3cd4a8357c1cd8e6a9f5eac6f31'
+ '44ddfe0a758b2019bfc1bab5a20eabf93169c7e8752229b21b586501417e6ba7'
+ '5d015f7c3531ca1b71af816f61f7ebe136aea27d9e512428b63d900a62ff1da7'
+ '14d906805171e5dd48e68554211f1f16ed11072cd7e53a64b072966c55cedd4f'
+ '1723977a803dbccaab2304ea40f709f4a6dea8e14b13208563b0258a1928fa61'
+ 'de47a6abdd33b662002016d384ea173c524dc8992c28ef6e2aca5d46141e6171'
+ '1cc21b1d55521e812b498d345e39d762e294ee52d344610b08ad3a8596119dae'
+ '75a804ea7e28b3794ce11122dd4fcf80652e115ee7f3b785f8f7853fd7869881')
_kernelname=${pkgbase#linux}