From abe03fc4e8c8d92e27619e75e7d920f8270217f4 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 1 Apr 2015 21:11:08 -0300
Subject: linux-libre-{pae,xen}-3.19.3_gnu-1.1: fix system boot hang with
 libreboot -> https://bugzilla.kernel.org/show_bug.cgi?id=93171

---
 kernels/linux-libre-xen/PKGBUILD | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'kernels/linux-libre-xen/PKGBUILD')

diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index fab71239d..14b6e9902 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -18,7 +18,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
-pkgrel=1
+pkgrel=1.1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,7 +33,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm}
-        'change-default-console-loglevel.patch')
+        'change-default-console-loglevel.patch'
+        '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch')
 sha256sums=('2a60ec99ae498e7cdafac63ecca1c0ca07643eaa6c9a1a83f19e4daa3e75b9d9'
             'SKIP'
             'a8d04a9fc441edfa5fbdc9727743d584e7103d97ca13da4c667a894c4eff5a58'
@@ -43,7 +44,8 @@ sha256sums=('2a60ec99ae498e7cdafac63ecca1c0ca07643eaa6c9a1a83f19e4daa3e75b9d9'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
             '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
-            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
+            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+            '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
 )
@@ -73,6 +75,10 @@ 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"
+
   cat "${srcdir}/config" > ./.config # simpler
 
   # append pkgrel to extraversion
-- 
cgit v1.2.3-54-g00ecf