[arch-commits] Commit in linux-hardened/trunk (3 files)

[Levente Polyak]

    Date: Saturday, September 15, 2018 @ 14:33:21
  Author: anthraxx
Revision: 334626

upgpkg: linux-hardened 4.18.8.a-1

Modified:
  linux-hardened/trunk/PKGBUILD
  linux-hardened/trunk/config.x86_64
Deleted:
  linux-hardened/trunk/drm-i915-Increase-LSPCON-timeout.patch

----------------------------------------+
 PKGBUILD                               |   10 ++---
 config.x86_64                          |    2 -
 drm-i915-Increase-LSPCON-timeout.patch |   54 -------------------------------
 3 files changed, 5 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-15 14:31:25 UTC (rev 334625)
+++ PKGBUILD	2018-09-15 14:33:21 UTC (rev 334626)
@@ -4,7 +4,7 @@
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgbase=linux-hardened
-_pkgver=4.18.7
+_pkgver=4.18.8
 _hardenedver=a
 _srcname=linux-${_pkgver}
 pkgver=${_pkgver}.${_hardenedver}
@@ -22,19 +22,17 @@
         90-linux.hook  # pacman hook for initramfs regeneration
         linux.preset   # standard config files for mkinitcpio ramdisk
 
-        drm-i915-Increase-LSPCON-timeout.patch
         HID-core-fix-grouping-by-application.patch
 )
 replaces=('linux-grsec')
-sha256sums=('f03b425e262a71e5079736706233a4e9afaf77c8462b552b4d6db2d33f5af731'
+sha256sums=('f1551bad69ab617708fa8cf3f94545ae03dd350bdeb3065fbcf39c1a7df85494'
             'SKIP'
-            '7d716cdb26f3437660b807d68acc0406a2ba9dba59c62388d65373a19477f7ac'
+            'f36fcb8d263b7361fe84d2673426d37c4ba5bfbad4e9ebe914579e672586e845'
             'SKIP'
-            '48ac32d2fa684add651b3172e9499a39081191d9bda31e9ff9cc7a959b88b13f'
+            'c7f9d1a2f6dfdbf9d625560681da8dadff50da1ea6b13362e7fb8a1abbd4c286'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            '2f26b6273ded6d4031fd7115fac843b7bb90df9a28da8dc1b7f49294d3d39ee7'
             '472f606f043b16336f5335021285efe3a7658fb8467917409cb58c9a57a7b0a5')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds

Modified: config.x86_64
===================================================================
--- config.x86_64	2018-09-15 14:31:25 UTC (rev 334625)
+++ config.x86_64	2018-09-15 14:33:21 UTC (rev 334626)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.7 Kernel Configuration
+# Linux/x86 4.18.8 Kernel Configuration
 #
 
 #

Deleted: drm-i915-Increase-LSPCON-timeout.patch
===================================================================
--- drm-i915-Increase-LSPCON-timeout.patch	2018-09-15 14:31:25 UTC (rev 334625)
+++ drm-i915-Increase-LSPCON-timeout.patch	2018-09-15 14:33:21 UTC (rev 334626)
@@ -1,54 +0,0 @@
-From 299c2a904b1e8d5096d4813df6371357d97a6cd1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fredrik=20Sch=C3=B6n?= <fredrikschon at 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 at intel.com>
-Cc: Imre Deak <imre.deak at intel.com>
-Cc: Jani Nikula <jani.nikula at intel.com>
-Cc: <stable at vger.kernel.org> # v4.11+
-Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
-Reviewed-by: Shashank Sharma <shashank.sharma at intel.com>
-Signed-off-by: Fredrik Schön <fredrik.schon at gmail.com>
-Signed-off-by: Jani Nikula <jani.nikula at 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 at 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
-