diff options
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | config.x86_64 | 2 | ||||
| -rw-r--r-- | drm-i915-Increase-LSPCON-timeout.patch | 54 |
3 files changed, 5 insertions, 62 deletions
@@ -6,7 +6,7 @@ pkgbase=linux-hardened-ck _majver=4.18 -_minver=7 +_minver=8 _pkgver=${_majver}.${_minver} _hardenedver=a _NUMAdisable=y @@ -41,22 +41,20 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.tar.xz 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 ) -sha256sums=('f03b425e262a71e5079736706233a4e9afaf77c8462b552b4d6db2d33f5af731' +sha256sums=('f1551bad69ab617708fa8cf3f94545ae03dd350bdeb3065fbcf39c1a7df85494' 'SKIP' - '7d716cdb26f3437660b807d68acc0406a2ba9dba59c62388d65373a19477f7ac' + 'f36fcb8d263b7361fe84d2673426d37c4ba5bfbad4e9ebe914579e672586e845' 'SKIP' 'cb33bfe492aeef9b1fda8d448483a7ef3d3fe27448e2114a775b25beb1bd8830' '6e1f3cc3eb9a1e30a69ef1999f9aa6ad7f2f9fe4af7ba5dabe25d4ff19ee6740' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' - '0a51d3ec9e6500239b057f1519356de0763a70949a5a568258b1099725cb3de3' + 'd42702d985b54a762f5ff737e8700bf2bfcc8b0058d89839e47d526f81dca6d5' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '2f26b6273ded6d4031fd7115fac843b7bb90df9a28da8dc1b7f49294d3d39ee7' '472f606f043b16336f5335021285efe3a7658fb8467917409cb58c9a57a7b0a5') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -77,7 +75,6 @@ prepare() { # Hotfixes msg2 "Applying hotfixes" - patch -p1 -i ../drm-i915-Increase-LSPCON-timeout.patch patch -p1 -i ../HID-core-fix-grouping-by-application.patch # linux hardened patch diff --git a/config.x86_64 b/config.x86_64 index 184f704..02aeaad 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.7 Kernel Configuration +# Linux/x86 4.18.8 Kernel Configuration # # diff --git a/drm-i915-Increase-LSPCON-timeout.patch b/drm-i915-Increase-LSPCON-timeout.patch deleted file mode 100644 index 38ec01f..0000000 --- a/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 - |