summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO64
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch2
-rw-r--r--0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch2
-rw-r--r--0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch2
-rw-r--r--0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch (renamed from 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch)4
-rw-r--r--0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch (renamed from 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch)4
-rw-r--r--0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch (renamed from 0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch)4
-rw-r--r--0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch (renamed from 0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch)4
-rw-r--r--0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch (renamed from 0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch)4
-rw-r--r--0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch (renamed from 0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch)4
-rw-r--r--0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch (renamed from 0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch)4
-rw-r--r--0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch (renamed from 0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch)4
-rw-r--r--0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch (renamed from 0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch)4
-rw-r--r--0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch (renamed from 0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch)4
-rw-r--r--0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch80
-rw-r--r--PKGBUILD92
16 files changed, 183 insertions, 99 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5e0c044e4169..773b8ef71b94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-rc
- pkgver = 5.4.13rc1
- pkgrel = 2
+ pkgver = 5.4.15rc1
+ pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
license = GPL2
@@ -9,44 +9,46 @@ pkgbase = linux-rc
makedepends = bc
makedepends = libelf
options = !strip
- 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 = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.15-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.15-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.14.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.14.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
source = 0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
- source = 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
- source = 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
- source = 0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
- 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-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
+ source = 0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+ source = 0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+ source = 0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+ source = 0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+ source = 0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+ source = 0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+ source = 0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
+ source = 0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+ source = 0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+ source = 0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+ source = 0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 9bae8b2f674152e4d126a505d1e89958b5de735791ebb7d321e436ff767990f3
+ sha256sums = 478af3d39f5b87f9c7d5e063ddea91ab8b6530c081b90de01798b1fbd1e47ca1
sha256sums = SKIP
- sha256sums = d9c3c7a2d52d25c24cbca0f89d55511422d3d207c573d42ec58f7f17c948d0fb
+ sha256sums = 531e18b0eef516fa4b3843f89729fafbf3c6bc00325b082cc1f2cfcb28c8d7f0
sha256sums = SKIP
sha256sums = eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31
- sha256sums = 9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee
- sha256sums = 0ee10a8bce75e243f20dcae2bf627325a65b0a725fc4af70b585e170a4c5b984
- sha256sums = 1bc6c7503d5e30196ccb2210bbd9d17d73c245afa82a671d4ccf14796047cca6
- sha256sums = 66a5cdff9a5a83d4f691f38b18a06bf373c32be9200ca8708eddde560fc8f33d
- sha256sums = 4073da89517a8e25ceb63c686c0f4b5a3988ad91d4bfa7977a508e6f41dd56da
- sha256sums = d32cca150a2ccb9e5b144769e75ef7a7b851f3cd4a8357c1cd8e6a9f5eac6f31
- sha256sums = 44ddfe0a758b2019bfc1bab5a20eabf93169c7e8752229b21b586501417e6ba7
- sha256sums = 5d015f7c3531ca1b71af816f61f7ebe136aea27d9e512428b63d900a62ff1da7
- sha256sums = 14d906805171e5dd48e68554211f1f16ed11072cd7e53a64b072966c55cedd4f
- sha256sums = 1723977a803dbccaab2304ea40f709f4a6dea8e14b13208563b0258a1928fa61
- sha256sums = de47a6abdd33b662002016d384ea173c524dc8992c28ef6e2aca5d46141e6171
- sha256sums = 1cc21b1d55521e812b498d345e39d762e294ee52d344610b08ad3a8596119dae
- sha256sums = 75a804ea7e28b3794ce11122dd4fcf80652e115ee7f3b785f8f7853fd7869881
+ sha256sums = 6bc06821c6dc94a8af1018df31780dfbad354dce46792f65ee45bf6261968ec7
+ sha256sums = 4cdf7a686248aceeed6ca0296636dc0d4efaede2b77df98a6c3d559116156a00
+ sha256sums = c21b89ac3d24445dafcd8a3f2dfb6574eae0f50f3849f8abf1126862e2f82dcd
+ sha256sums = 2c7733955ede78f64b21d14b2f3ad0c8e0e98cc5eccb3228e532203d9c60056b
+ sha256sums = aa19094814bf528f760c7bc5f207fe51d1163c9255add0fad09f15d8747b4e8e
+ sha256sums = 8ec48bcab7e133fb3fcd49bac9e6aa8075beb2720ae07832a0c4962df9309b7c
+ sha256sums = 4d497f775c8785771cf28ed7a807d53617dfb914567def8b65a970c7472a8dc4
+ sha256sums = 022be9ea56431b07a169765def3f5b33330d710be527fde652a0164e1108d96f
+ sha256sums = 77f0cbc3fb6fd7e357c9c052b9d483e00a542eba3cf7f5baba2576f96ba71416
+ sha256sums = c7602e3ef7986da9b8a6197db281ee41381fae65ed2d1a814160638acd6978e9
+ sha256sums = 9fc6cfeab4da541b06993cc5a42d1d7de78238bcaf477d523cc51ae5337bd050
+ sha256sums = ba20b1928026473497a69e2a1c1c7c5fdd63c5f63818036998d9ee96258c34c1
+ sha256sums = a81cff6b669e36778a420b2c441a0ae79f257096d1059cc293bea931b91f6ff1
+ sha256sums = fa7b003f7c5acabae8cff051630a93e3d4556c275067516bb05922bfd9ee8b28
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 5d4014a2b457..280298640a9d 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 a8d736bad70d4062a14c29bdcbed71bef7b575f5 Mon Sep 17 00:00:00 2001
+From 8bd7ec174daab92ac3305aca4d0ec09418254eff 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
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 d12405111c37..b3bb6a7f675d 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 1e41b685fcac38c05219030acb033a42832f7459 Mon Sep 17 00:00:00 2001
+From 6a7489b6d1f0a586c08cc3ae6887f53f59e96b86 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
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 cd1bc9b3f6c6..160e043bdaaf 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 3f0415751d3c1456d314a46d9f28053c8c2a7afa Mon Sep 17 00:00:00 2001
+From 80b9003aa031b66333ab68692e0661b8d7a7e5f7 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
diff --git a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
index 3e01de8a8444..e83e071bc535 100644
--- a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+++ b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
@@ -1,7 +1,7 @@
-From 02dc4cbf4b169ff89a2380b178e07e20eb661d62 Mon Sep 17 00:00:00 2001
+From 4c3a182e5ce8a05eb3db20b908a60015fb47d021 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
+Subject: [PATCH 04/15] PCI: pciehp: Prevent deadlock on disconnect
This addresses deadlocks in these common cases in hierarchies containing
two switches:
diff --git a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
index cac7e7ede3e3..26a8c985ee17 100644
--- a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+++ b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
@@ -1,7 +1,7 @@
-From b5ae067d036c7d621af4178bba61c8c6fa3c7850 Mon Sep 17 00:00:00 2001
+From ab195ccffbd0721892d70102ab836fd106361fe7 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
+Subject: [PATCH 05/15] ACPI: PM: s2idle: Rework ACPI events synchronization
Note that the EC GPE processing need not be synchronized in
acpi_s2idle_wake() after invoking acpi_ec_dispatch_gpe(), because
diff --git a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index 5657d6c37036..799133b03d33 100644
--- a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -1,7 +1,7 @@
-From 6c245b6bc1a0c4979566dbd13edcb553919010d7 Mon Sep 17 00:00:00 2001
+From e2842366b3a552a92584adf926eed813baeb6c68 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
+Subject: [PATCH 06/15] iwlwifi: pcie: restore support for Killer Qu C0 NICs
Commit 809805a820c6 refactored the cfg mangling. Unfortunately, in this
process the lines which picked the right cfg for Killer Qu C0 NICs after
diff --git a/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch b/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
index bbd3e5dd57da..a94a9a4f9cf7 100644
--- a/0008-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+++ b/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
@@ -1,7 +1,7 @@
-From ac55f63c14c1e7d0740c27d325e8abe40e2478b3 Mon Sep 17 00:00:00 2001
+From 4e768b987ae3cde128a3e73b922a5bb8323b07e0 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
+Subject: [PATCH 07/15] drm/i915: save AUD_FREQ_CNTRL state at audio domain
suspend
When audio power domain is suspended, the display driver must
diff --git a/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch b/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
index 591c4f4dd8df..ea89decb51e3 100644
--- a/0009-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+++ b/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
@@ -1,7 +1,7 @@
-From 77437dba84a29da0fdf62f9946416b6e53496b1d Mon Sep 17 00:00:00 2001
+From ec0217ea2a6aeb9b99b84bbc7b01023ab1f3547a 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+
+Subject: [PATCH 08/15] drm/i915: Fix audio power up sequence for gen10+
display
On platfroms with gen10+ display, driver must set the enable bit of
diff --git a/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch b/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
index 92108ff2e864..247c92515355 100644
--- a/0010-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+++ b/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
@@ -1,7 +1,7 @@
-From 466961b7872771f84a86f2304197d303ed749925 Mon Sep 17 00:00:00 2001
+From cadc43b7d4de84c039658b482b52581b6d170081 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
+Subject: [PATCH 09/15] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
platforms
The CDCLK>=2*BCLK constraint applies to all generations since gen10.
diff --git a/0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch b/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
index a24c8925445b..2e6f4736b80e 100644
--- a/0011-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
+++ b/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
@@ -1,7 +1,7 @@
-From 238026166679e618b3bad1c86b0e37a43303b6b0 Mon Sep 17 00:00:00 2001
+From 2828549af6c24235da03337c781053d4fc5edd08 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
+Subject: [PATCH 10/15] drm/i915: Limit audio CDCLK>=2*BCLK constraint back to
GLK only
Revert changes done in commit f6ec9483091f ("drm/i915: extend audio
diff --git a/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
index dab476ce6d4a..c65bc6b8ef20 100644
--- a/0012-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+++ b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
@@ -1,7 +1,7 @@
-From c7e2526442e1a92f2c875c0300935918a295f527 Mon Sep 17 00:00:00 2001
+From a8b102fd92427e5151d0c61f632fbe19dbe950b6 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
+Subject: [PATCH 11/15] pinctrl: sunrisepoint: Add missing Interrupt Status
register offset
Commit 179e5a6114cc ("pinctrl: intel: Remove default Interrupt Status
diff --git a/0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch b/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
index 8dcb254db05b..70449614eb03 100644
--- a/0013-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+++ b/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
@@ -1,7 +1,7 @@
-From ad6657302538790fdf5c0c0f6e88add139e0c530 Mon Sep 17 00:00:00 2001
+From a5962f62a4174023fa53d6c74e64fa83032dca56 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"
+Subject: [PATCH 12/15] Revert "iwlwifi: mvm: fix scan config command size"
Since v5.4-rc1 was released, iwlwifi started throwing errors when scan
commands were sent to the firmware with certain devices (depending on
diff --git a/0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch b/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
index 17a717ed59eb..616c28ecd742 100644
--- a/0014-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+++ b/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
@@ -1,7 +1,7 @@
-From 22aa8417725e7b4cb467a78a6bce6f23ad799d98 Mon Sep 17 00:00:00 2001
+From abfe541c371e84c6db50fd907c6a9941ee0a7da6 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"
+Subject: [PATCH 13/15] e1000e: Revert "e1000e: Make watchdog use delayed work"
This reverts commit 59653e6497d16f7ac1d9db088f3959f57ee8c3db.
diff --git a/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch b/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
new file mode 100644
index 000000000000..6d4462df8915
--- /dev/null
+++ b/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
@@ -0,0 +1,80 @@
+From ca12fbca4bf7482a73ace2a0504bd8fc7f980dc1 Mon Sep 17 00:00:00 2001
+From: Leo Li <sunpeng.li@amd.com>
+Date: Mon, 21 Oct 2019 14:58:47 -0400
+Subject: [PATCH 14/15] drm/amdgpu: Add DC feature mask to disable fractional
+ pwm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[Why]
+
+Some LED panel drivers might not like fractional PWM. In such cases,
+backlight flickering may be observed.
+
+[How]
+
+Add a DC feature mask to disable fractional PWM, and associate it with
+the preexisting dc_config flag.
+
+The flag is only plumbed through the dmcu firmware, so plumb it through
+the driver path as well.
+
+To disable, add the following to the linux cmdline:
+amdgpu.dcfeaturemask=0x4
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204957
+Signed-off-by: Leo Li <sunpeng.li@amd.com>
+Reviewed-by: Anthony Koo <anthony.koo@amd.com>
+Tested-by: Lukáš Krejčí <lskrejci@gmail.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 4 ++++
+ drivers/gpu/drm/amd/include/amd_shared.h | 1 +
+ 3 files changed, 8 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 4e9c15c409ba..25b72eb76add 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -697,6 +697,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
+ if (amdgpu_dc_feature_mask & DC_MULTI_MON_PP_MCLK_SWITCH_MASK)
+ init_data.flags.multi_mon_pp_mclk_switch = true;
+
++ if (amdgpu_dc_feature_mask & DC_DISABLE_FRACTIONAL_PWM_MASK)
++ init_data.flags.disable_fractional_pwm = true;
++
+ init_data.flags.power_down_display_on_boot = true;
+
+ #ifdef CONFIG_DRM_AMD_DC_DCN2_0
+diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
+index 7700a855d77c..698b84acc44f 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
+@@ -404,6 +404,10 @@ static bool dce_abm_init_backlight(struct abm *abm)
+ /* Enable the backlight output */
+ REG_UPDATE(BL_PWM_CNTL, BL_PWM_EN, 1);
+
++ /* Disable fractional pwm if configured */
++ REG_UPDATE(BL_PWM_CNTL, BL_PWM_FRACTIONAL_EN,
++ abm->ctx->dc->config.disable_fractional_pwm ? 0 : 1);
++
+ /* Unlock group 2 backlight registers */
+ REG_UPDATE(BL_PWM_GRP1_REG_LOCK,
+ BL_PWM_GRP1_REG_LOCK, 0);
+diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
+index 8889aaceec60..5450ed762b7a 100644
+--- a/drivers/gpu/drm/amd/include/amd_shared.h
++++ b/drivers/gpu/drm/amd/include/amd_shared.h
+@@ -143,6 +143,7 @@ enum PP_FEATURE_MASK {
+ enum DC_FEATURE_MASK {
+ DC_FBC_MASK = 0x1,
+ DC_MULTI_MON_PP_MCLK_SWITCH_MASK = 0x2,
++ DC_DISABLE_FRACTIONAL_PWM_MASK = 0x4,
+ };
+
+ enum amd_dpm_forced_level;
+--
+2.25.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 04958b0a014f..555936de3724 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
# Contributorr: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-rc
-pkgrel=2
+pkgrel=1
_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=12
+_minor=14
### on initial release comment this out and set to =1
_minorc=$((_minor+1))
#_minorc=1
@@ -33,39 +33,41 @@ source=(
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
-0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
-0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
-0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
-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-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
+0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
+0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('9bae8b2f674152e4d126a505d1e89958b5de735791ebb7d321e436ff767990f3'
+sha256sums=('478af3d39f5b87f9c7d5e063ddea91ab8b6530c081b90de01798b1fbd1e47ca1'
'SKIP'
- 'd9c3c7a2d52d25c24cbca0f89d55511422d3d207c573d42ec58f7f17c948d0fb'
+ '531e18b0eef516fa4b3843f89729fafbf3c6bc00325b082cc1f2cfcb28c8d7f0'
'SKIP'
'eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31'
- '9c507bdb0062b5b54c6969f7da9ec18b259e06cd26dbe900cfe79a7ffb2713ee'
- '0ee10a8bce75e243f20dcae2bf627325a65b0a725fc4af70b585e170a4c5b984'
- '1bc6c7503d5e30196ccb2210bbd9d17d73c245afa82a671d4ccf14796047cca6'
- '66a5cdff9a5a83d4f691f38b18a06bf373c32be9200ca8708eddde560fc8f33d'
- '4073da89517a8e25ceb63c686c0f4b5a3988ad91d4bfa7977a508e6f41dd56da'
- 'd32cca150a2ccb9e5b144769e75ef7a7b851f3cd4a8357c1cd8e6a9f5eac6f31'
- '44ddfe0a758b2019bfc1bab5a20eabf93169c7e8752229b21b586501417e6ba7'
- '5d015f7c3531ca1b71af816f61f7ebe136aea27d9e512428b63d900a62ff1da7'
- '14d906805171e5dd48e68554211f1f16ed11072cd7e53a64b072966c55cedd4f'
- '1723977a803dbccaab2304ea40f709f4a6dea8e14b13208563b0258a1928fa61'
- 'de47a6abdd33b662002016d384ea173c524dc8992c28ef6e2aca5d46141e6171'
- '1cc21b1d55521e812b498d345e39d762e294ee52d344610b08ad3a8596119dae'
- '75a804ea7e28b3794ce11122dd4fcf80652e115ee7f3b785f8f7853fd7869881')
+ '6bc06821c6dc94a8af1018df31780dfbad354dce46792f65ee45bf6261968ec7'
+ '4cdf7a686248aceeed6ca0296636dc0d4efaede2b77df98a6c3d559116156a00'
+ 'c21b89ac3d24445dafcd8a3f2dfb6574eae0f50f3849f8abf1126862e2f82dcd'
+ '2c7733955ede78f64b21d14b2f3ad0c8e0e98cc5eccb3228e532203d9c60056b'
+ 'aa19094814bf528f760c7bc5f207fe51d1163c9255add0fad09f15d8747b4e8e'
+ '8ec48bcab7e133fb3fcd49bac9e6aa8075beb2720ae07832a0c4962df9309b7c'
+ '4d497f775c8785771cf28ed7a807d53617dfb914567def8b65a970c7472a8dc4'
+ '022be9ea56431b07a169765def3f5b33330d710be527fde652a0164e1108d96f'
+ '77f0cbc3fb6fd7e357c9c052b9d483e00a542eba3cf7f5baba2576f96ba71416'
+ 'c7602e3ef7986da9b8a6197db281ee41381fae65ed2d1a814160638acd6978e9'
+ '9fc6cfeab4da541b06993cc5a42d1d7de78238bcaf477d523cc51ae5337bd050'
+ 'ba20b1928026473497a69e2a1c1c7c5fdd63c5f63818036998d9ee96258c34c1'
+ 'a81cff6b669e36778a420b2c441a0ae79f257096d1059cc293bea931b91f6ff1'
+ 'fa7b003f7c5acabae8cff051630a93e3d4556c275067516bb05922bfd9ee8b28')
_kernelname=${pkgbase#linux}
@@ -76,12 +78,12 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
prepare() {
cd linux-${_fullver}
- msg2 "Setting version..."
+ echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
- msg2 "Applying $_rcpatch..."
+ echo "Applying $_rcpatch..."
patch -Np1 <"../$_rcpatch"
local src
@@ -89,16 +91,16 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
[[ $src = *.patch ]] || continue
- msg2 "Applying patch $src..."
+ echo "Applying patch $src..."
patch -Np1 < "../$src"
done
- msg2 "Setting config..."
+ echo "Setting config..."
cp ../config .config
make olddefconfig
make -s kernelrelease > version
- msg2 "Prepared %s version %s" "$pkgbase" "$(<version)"
+ echo "Prepared %s version %s" "$pkgbase" "$(<version)"
}
build() {
@@ -117,7 +119,7 @@ _package() {
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
- msg2 "Installing boot image..."
+ echo "Installing boot image..."
# systemd expects to find the kernel here to allow hibernation
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
@@ -125,13 +127,13 @@ _package() {
# Used by mkinitcpio to name the kernel
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
- msg2 "Installing modules..."
+ echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
# remove build and source links
rm "$modulesdir"/{source,build}
- msg2 "Fixing permissions..."
+ echo "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir"
}
@@ -141,7 +143,7 @@ _package-headers() {
cd linux-${_fullver}
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
- msg2 "Installing build files..."
+ echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
localversion.* version vmlinux
install -Dt "$builddir/kernel" -m644 kernel/Makefile
@@ -154,7 +156,7 @@ _package-headers() {
# add xfs and shmem for aufs building
mkdir -p "$builddir"/{fs/xfs,mm}
- msg2 "Installing headers..."
+ echo "Installing headers..."
cp -t "$builddir" -a include
cp -t "$builddir/arch/x86" -a arch/x86/include
install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
@@ -170,10 +172,10 @@ _package-headers() {
install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
- msg2 "Installing KConfig files..."
+ echo "Installing KConfig files..."
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
- msg2 "Removing unneeded architectures..."
+ echo "Removing unneeded architectures..."
local arch
for arch in "$builddir"/arch/*/; do
[[ $arch = */x86/ ]] && continue
@@ -181,16 +183,16 @@ _package-headers() {
rm -r "$arch"
done
- msg2 "Removing documentation..."
+ echo "Removing documentation..."
rm -r "$builddir/Documentation"
- msg2 "Removing broken symlinks..."
+ echo "Removing broken symlinks..."
find -L "$builddir" -type l -printf 'Removing %P\n' -delete
- msg2 "Removing loose objects..."
+ echo "Removing loose objects..."
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
- msg2 "Stripping build tools..."
+ echo "Stripping build tools..."
local file
while read -rd '' file; do
case "$(file -bi "$file")" in
@@ -205,11 +207,11 @@ _package-headers() {
esac
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
- msg2 "Adding symlink..."
+ echo "Adding symlink..."
mkdir -p "$pkgdir/usr/src"
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
- msg2 "Fixing permissions..."
+ echo "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir"
}