diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0002-Increase-timeout-in-lspcon_wait_mode.patch | 26 | ||||
-rw-r--r-- | 0002-drm-i915-Increase-LSPCON-timeout.patch | 47 | ||||
-rw-r--r-- | PKGBUILD | 22 |
4 files changed, 68 insertions, 33 deletions
@@ -8,6 +8,8 @@ pkgbase = linux-uksm makedepends = inetutils makedepends = bc makedepends = libelf + makedepends = python-sphinx + makedepends = graphviz options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.4.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.4.tar.sign @@ -19,7 +21,7 @@ pkgbase = linux-uksm source = 99-linux.hook source = linux.preset source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - source = 0002-Increase-timeout-in-lspcon_wait_mode.patch + source = 0002-drm-i915-Increase-LSPCON-timeout.patch validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha512sums = 9e464a44aea7678674e066e2e6cfec3cf74d8a8cdc11146a68d25f25b4e4e11c8b5b905bc5e3161c51a4b9a8c9b1d2d9f72140db874e80173aa4b10b6209e870 sha512sums = SKIP @@ -31,7 +33,7 @@ pkgbase = linux-uksm sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74 sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf sha512sums = 9dac5b65f2af3e4e6d0881e8367a818b67fef81c254e5e8ce971c76edd078516dea913771a77ca54a7c2f25250e29da93a8f4afa55b337b05df0a5bf291e6b03 - sha512sums = e8e05699aa8028fd498d9b5d055fd15e04012411e2948a0751bd9342265365fdebc197203919b9371da935960a5393f4161d6e0b396472e11837fa8563077bae + sha512sums = 1ab3b2662d521a6d2edcca7b8f466790786c11651fee64020ba5d2b6481fb3539d6556e21b07d0487b059e8214a6bac7e263f2c11693b29a94ce65b1f5b432f4 pkgname = linux-uksm pkgdesc = Linux Kernel and modules with the UKSM. diff --git a/0002-Increase-timeout-in-lspcon_wait_mode.patch b/0002-Increase-timeout-in-lspcon_wait_mode.patch deleted file mode 100644 index 72eeafe933fa..000000000000 --- a/0002-Increase-timeout-in-lspcon_wait_mode.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f9199cfdc7f09601adbb40827077991a1f6bd73a Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Mon, 13 Aug 2018 00:40:29 +0200 -Subject: [PATCH 2/2] Increase timeout in lspcon_wait_mode - -From https://bugs.freedesktop.org/attachment.cgi?id=141051&action=edit ---- - 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 8ae8f42f430a..be1b08f589a4 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, 1000); - if (current_mode != mode) - DRM_ERROR("LSPCON mode hasn't settled\n"); - --- -2.18.0.547.g1d89318c4 - diff --git a/0002-drm-i915-Increase-LSPCON-timeout.patch b/0002-drm-i915-Increase-LSPCON-timeout.patch new file mode 100644 index 000000000000..5f5261fb0965 --- /dev/null +++ b/0002-drm-i915-Increase-LSPCON-timeout.patch @@ -0,0 +1,47 @@ +From 4e09b725c6fa6530385d97363346e72a26d418be 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 2/2] 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> +Signed-off-by: Fredrik Schön <fredrik.schon@gmail.com> +Reviewed-by: Shashank Sharma <shashank.sharma@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 8ae8f42f430a1..6b6758419fb34 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"); + @@ -59,7 +59,7 @@ arch=('x86_64') url="https://github.com/dolohow/uksm" license=('GPL2') options=('!strip') -makedepends=('kmod' 'inetutils' 'bc' 'libelf') +makedepends=('kmod' 'inetutils' 'bc' 'libelf' 'python-sphinx' 'graphviz') #_lucjanpath="https://raw.githubusercontent.com/sirlucjan/kernel-patches/master/${_major}" _lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/${_major}" #_uksm_path="https://raw.githubusercontent.com/dolohow/uksm/master" @@ -83,7 +83,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" # standard config files for mkinitcpio ramdisk 'linux.preset' '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' - '0002-Increase-timeout-in-lspcon_wait_mode.patch') + '0002-drm-i915-Increase-LSPCON-timeout.patch') _kernelname=${pkgbase#linux} : ${_kernelname:=-uksm} @@ -193,7 +193,7 @@ prepare() { build() { cd ${_srcname} - make bzImage modules + make bzImage modules htmldocs } _package() { @@ -348,10 +348,22 @@ _package-docs() { mkdir -p "$builddir" cp -t "$builddir" -a Documentation + msg2 "Removing doctrees..." + rm -r "$builddir/Documentation/output/.doctrees" + + msg2 "Moving HTML docs..." + local src dst + while read -rd '' src; do + dst="$builddir/Documentation/${src#$builddir/Documentation/output/}" + mkdir -p "${dst%/*}" + mv "$src" "$dst" + rmdir -p --ignore-fail-on-non-empty "${src%/*}" + done < <(find "$builddir/Documentation/output" -type f -print0) + msg2 "Adding symlink..." mkdir -p "$pkgdir/usr/share/doc" ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase" - + msg2 "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" } @@ -375,7 +387,7 @@ sha512sums=('9e464a44aea7678674e066e2e6cfec3cf74d8a8cdc11146a68d25f25b4e4e11c8b5 '6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '9dac5b65f2af3e4e6d0881e8367a818b67fef81c254e5e8ce971c76edd078516dea913771a77ca54a7c2f25250e29da93a8f4afa55b337b05df0a5bf291e6b03' - 'e8e05699aa8028fd498d9b5d055fd15e04012411e2948a0751bd9342265365fdebc197203919b9371da935960a5393f4161d6e0b396472e11837fa8563077bae') + '1ab3b2662d521a6d2edcca7b8f466790786c11651fee64020ba5d2b6481fb3539d6556e21b07d0487b059e8214a6bac7e263f2c11693b29a94ce65b1f5b432f4') validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman |