From 55ab733a1336b8b1ca2fcadc25d6006baaf48b7a Mon Sep 17 00:00:00 2001
From: Dan Ziemba <zman0900@gmail.com>
Date: Tue, 3 Nov 2015 23:09:53 -0500
Subject: [PATCH] Fixed i915 VGA arbitration patch

---
 .SRCINFO       | 2 +-
 PKGBUILD       | 4 +++-
 i915_317.patch | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 5aec2a2..fa8bc77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,7 @@ pkgbase = linux-vfio
 	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149
-	sha256sums = 65faab45248008810b0a5f27162101a34dfe298c14d3506e52236c680353d7f8
+	sha256sums = ff2bb84f054633c6088ad31b450b7b96b5f4ee18667dd56772dff1d8c1687854
 
 pkgname = linux-vfio
 	pkgdesc = The Linux kernel and modules with patches to enable GPU passthrough with KVM
diff --git a/PKGBUILD b/PKGBUILD
index 06a3166..f2fd0b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ sha256sums=('4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149'
-            '65faab45248008810b0a5f27162101a34dfe298c14d3506e52236c680353d7f8')
+            'ff2bb84f054633c6088ad31b450b7b96b5f4ee18667dd56772dff1d8c1687854')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -57,9 +57,11 @@ prepare() {
   fi
 
   # patches for vga arbiter fix in intel systems
+  echo '==> Applying i915 VGA arbitration patch'
   patch -Np1 -i "${srcdir}/i915_317.patch"
 
   # Overrides for missing acs capabilities
+  echo '==> Applying ACS override patch'
   patch -p1 -i "${srcdir}/override_for_missing_acs_capabilities.patch"
 
   if [ "${_kernelname}" != "" ]; then
diff --git a/i915_317.patch b/i915_317.patch
index e13bb36..4b901b8 100644
--- a/i915_317.patch
+++ b/i915_317.patch
@@ -46,8 +46,8 @@ diff -rupN linux-3.17.old/drivers/gpu/drm/i915/i915_drv.h linux-3.17/drivers/gpu
  	bool disable_display;
  	bool disable_vtd_wa;
 +	bool enable_hd_vgaarb;
- 	int use_mmio_flip;
- 	bool mmio_debug;
+ 	bool enable_guc_submission;
+	int guc_log_level;
  };
 diff -rupN linux-3.17.old/drivers/gpu/drm/i915/i915_params.c linux-3.17/drivers/gpu/drm/i915/i915_params.c
 --- linux-3.17.old/drivers/gpu/drm/i915/i915_params.c	2014-10-05 17:23:04.000000000 -0200