diff options
author | Piotr Gorski | 2018-08-22 13:17:01 +0200 |
---|---|---|
committer | Piotr Gorski | 2018-08-22 13:17:01 +0200 |
commit | 37d7e5b3725f7f1e66ffe61ba91bc7b03f907daf (patch) | |
tree | c17905339d289d1e7ba9e4a48c72f1e9768de91e | |
parent | 3a9299727d09090ea57d0b1b9b298157d9109ba3 (diff) | |
download | aur-37d7e5b3725f7f1e66ffe61ba91bc7b03f907daf.tar.gz |
Sync with Arch
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-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-bfq-mq 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 @@ -20,7 +22,7 @@ pkgbase = linux-bfq-mq 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 sha256sums = 12dbc87b5bdb7c47980fefea06911ea43b9ef226747e17e879428e6d4d8ba842 sha256sums = SKIP @@ -33,7 +35,7 @@ pkgbase = linux-bfq-mq sha256sums = 5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 2f91c43b6848cbae2b2c1969323dcaf1c6aace130cd2165c543a7fcf73759aa1 - sha256sums = 3730fe7144a02ae7d9e6d7674138c8cd205f94dd56f141b527b07333ce7f404c + sha256sums = 31904ff5b35e1bdddaf8a27016179d7c299ce4304b266643957c3cd374e39386 pkgname = linux-bfq-mq pkgdesc = The Linux-bfq-mq kernel and modules with the BFQ-MQ scheduler 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"); + @@ -67,7 +67,7 @@ pkgrel=1 arch=('x86_64') url="https://github.com/Algodev-github/bfq-mq/" license=('GPL2') -makedepends=('kmod' 'inetutils' 'bc' 'libelf') +makedepends=('kmod' 'inetutils' 'bc' 'libelf' 'python-sphinx' 'graphviz') options=('!strip') _bfqpath="https://gitlab.com/tom81094/custom-patches/raw/master/bfq-mq" _lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.18" @@ -98,7 +98,7 @@ source=(# mainline kernel patches # 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') sha256sums=('12dbc87b5bdb7c47980fefea06911ea43b9ef226747e17e879428e6d4d8ba842' 'SKIP' @@ -111,7 +111,7 @@ sha256sums=('12dbc87b5bdb7c47980fefea06911ea43b9ef226747e17e879428e6d4d8ba842' '5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '2f91c43b6848cbae2b2c1969323dcaf1c6aace130cd2165c543a7fcf73759aa1' - '3730fe7144a02ae7d9e6d7674138c8cd205f94dd56f141b527b07333ce7f404c') + '31904ff5b35e1bdddaf8a27016179d7c299ce4304b266643957c3cd374e39386') validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) @@ -255,7 +255,7 @@ prepare() { build() { cd ${_srcname} - make bzImage modules + make bzImage modules htmldocs } _package() { @@ -410,7 +410,19 @@ _package-docs() { msg2 "Installing documentation..." 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" |