summaryrefslogtreecommitdiff
path: root/libre/linux-libre-hardened
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2018-09-19 16:19:24 -0300
committerDavid P <megver83@parabola.nu>2018-09-19 16:19:24 -0300
commita8a77a36f8d1ed67a978cdc5f254f63e1b0fdc24 (patch)
treec7eab149e0320309ab1a2e31fb67d7d8f8c8a646 /libre/linux-libre-hardened
parent8239628bd14674aa21065856aaccf1f463951720 (diff)
upgpkg: libre/linux-libre-hardened 4.18.8.a_gnu-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'libre/linux-libre-hardened')
-rw-r--r--libre/linux-libre-hardened/PKGBUILD9
-rw-r--r--libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch54
2 files changed, 3 insertions, 60 deletions
diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD
index 7d5398494..1138916b2 100644
--- a/libre/linux-libre-hardened/PKGBUILD
+++ b/libre/linux-libre-hardened/PKGBUILD
@@ -8,7 +8,7 @@
pkgbase=linux-libre-hardened
_srcbasever=4.18-gnu
-_srcver=4.18.7-gnu
+_srcver=4.18.8-gnu
_hardenedver=a
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -40,7 +40,6 @@ source=(
# other patches
'0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
'0002-fix-Atmel-maXTouch-touchscreen-support.patch'
- 'drm-i915-Increase-LSPCON-timeout.patch'
'HID-core-fix-grouping-by-application.patch'
)
validpgpkeys=(
@@ -51,9 +50,9 @@ validpgpkeys=(
)
sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471d3063016a4eb3f68d42879e18ee314ab30716116805fee35b5084b23df2a9'
'SKIP'
- 'eb6ac128ed56fa9a499e32939d71d2c4f3afa3c064882c34222c6ac23e2ea0f323155a400525e007093ff9313045c677fbc2f9487d42fd4c3b23a09d8454991f'
+ 'b65d13364a75dfef4b5f6510fda93e1f36bcedc073c7b90ff238ba991d26f666f7bbca4ec24726e09a962af6d78409ad1737a589e2708e24958fc31bcc67c255'
'SKIP'
- '037ffe18d550d31c692ca817373342f3da49008bb42780f130812eeb49cc30a6b69d839b723e211a1b7ba6e358f6e07cec216dc2243390a48df8118028be1711'
+ '6bba2c6bc16a9a797023f3056bb545a4958ce6f2c098943b841ae51eb8d6038bca33f7f4d63500ed17e678773393c097b18f33cde2495eb89b9491d1d5043cac'
'SKIP'
'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
'SKIP'
@@ -67,7 +66,6 @@ sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471
'2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
- '77e450e72b153ee01706a2976b8ca67303f4a52f1d87ab0ddf892a6532ca6ee4c9fa19e64ea88a2413765586a634a967156668c2d01419ffe2f4a55a62d5d3c3'
'0c7cca61b8a18626ebab5be9db9d445bf5b39b5324f337d43ebde2c7e1bed0fb212f6daca2c7a5bec694fbaa85a4dedb20ff55b92500e779a21998ac44c8a92d')
_kernelname=${pkgbase#linux-libre}
@@ -91,7 +89,6 @@ prepare() {
../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
# Arch's linux-hardened patches
- patch -p1 -i ../drm-i915-Increase-LSPCON-timeout.patch
patch -p1 -i ../HID-core-fix-grouping-by-application.patch
# maintain the TTY over USB disconnects
diff --git a/libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch b/libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch
deleted file mode 100644
index 38ec01fee..000000000
--- a/libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 299c2a904b1e8d5096d4813df6371357d97a6cd1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fredrik=20Sch=C3=B6n?= <fredrikschon@gmail.com>
-Date: Fri, 17 Aug 2018 22:07:28 +0200
-Subject: [PATCH] drm/i915: Increase LSPCON timeout
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-100 ms is not enough time for the LSPCON adapter on Intel NUC devices to
-settle. This causes dropped display modes at boot or screen reconfiguration.
-Empirical testing can reproduce the error up to a timeout of 190 ms. Basic
-boot and stress testing at 200 ms has not (yet) failed.
-
-Increase timeout to 400 ms to get some margin of error.
-
-Changes from v1:
-The initial suggestion of 1000 ms was lowered due to concerns about delaying
-valid timeout cases.
-Update patch metadata.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107503
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1570392
-Fixes: 357c0ae9198a ("drm/i915/lspcon: Wait for expected LSPCON mode to settle")
-Cc: Shashank Sharma <shashank.sharma@intel.com>
-Cc: Imre Deak <imre.deak@intel.com>
-Cc: Jani Nikula <jani.nikula@intel.com>
-Cc: <stable@vger.kernel.org> # v4.11+
-Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
-Signed-off-by: Fredrik Schön <fredrik.schon@gmail.com>
-Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20180817200728.8154-1-fredrik.schon@gmail.com
-(cherry picked from commit 59f1c8ab30d6f9042562949f42cbd3f3cf69de94)
-Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
----
- drivers/gpu/drm/i915/intel_lspcon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c
-index 5dae16ccd9f1..3e085c5f2b81 100644
---- a/drivers/gpu/drm/i915/intel_lspcon.c
-+++ b/drivers/gpu/drm/i915/intel_lspcon.c
-@@ -74,7 +74,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon,
- DRM_DEBUG_KMS("Waiting for LSPCON mode %s to settle\n",
- lspcon_mode_name(mode));
-
-- wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 100);
-+ wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 400);
- if (current_mode != mode)
- DRM_ERROR("LSPCON mode hasn't settled\n");
-
---
-2.18.0
-