diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch | 66 | ||||
| -rw-r--r-- | libre/linux-libre-grsec/PKGBUILD | 14 |
2 files changed, 4 insertions, 76 deletions
diff --git a/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index b23737a31..084b10b17 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec # Build kernel with -grsec localname _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.2-gnu _grsecver=3.1 -_timestamp=201505042053 +_timestamp=201505072057 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -41,15 +41,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch '4.0-rc7-37af2c8aae-loongson-community.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + '6b559c4393922896752822a63d22fb51f4aad0d8feb123a9c7a518d25ca7b378' 'SKIP' - '9944bf62201fa0ad86bc9d4a5e0368d64967b626933261868b2402547abd039b' + '62b75881f2bc760c585f77b73c335fbf439db042eb456abb8765fc644d7b5b5a' 'SKIP' 'd1b2bfc86563d522562850556a2dd39f41b91b992cb4d839551e44e8d9df0ae3' '92580d3bd2f8c66ccc9467e9a4bfbc012e90a3d32953503750309313755a3ea2' @@ -59,7 +58,6 @@ sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5' '8a070d193bc54db696b38ac844cfbfd62724f483ad74c9a288ccab462c32f80e') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -100,10 +98,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - # Adding loongson-community patch if [ "${CARCH}" == "mips64el" ]; then patch -p1 -i ${srcdir}/4.0-rc7-37af2c8aae-loongson-community.patch |