From 482e8efb4df8714502ed7de7ec98786189617632 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Jul 12 2016 09:05:40 +0000
Subject: Git snapshot du jour, bringing in a bunch of bugfixes


- Fix dpi issues on Surface 3 (also needs some kernel fixes)
- Hopefully fix rhbz#1354124

---

diff --git a/.gitignore b/.gitignore
index 4e2014c..7d706f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@ xf86-video-intel-2.10.0.tar.bz2
 /xf86-video-intel-20151206.tar.bz2
 /xf86-video-intel-20160119.tar.bz2
 /xf86-video-intel-20160512.tar.bz2
+/xf86-video-intel-20160712.tar.bz2
diff --git a/0001-sna-Let-modestting-glamor-handle-gen9.patch b/0001-sna-Let-modestting-glamor-handle-gen9.patch
index e27d548..ae29d5d 100644
--- a/0001-sna-Let-modestting-glamor-handle-gen9.patch
+++ b/0001-sna-Let-modestting-glamor-handle-gen9.patch
@@ -27,8 +27,8 @@ index 60835b9..5979cb9 100644
  	}
  
 +	/*
-+	 * We've no accel support for these, so let modesetting + glamor
-+	 * handle them.
++	 * Fedora specific modification: Do not use intel driver for skylake+
++	 * The intel driver is too much of a moving target / too buggy.
 +	 */
 +	if ((unsigned)((struct intel_device_info *)match_data)->gen >= 0110)
 +		return FALSE;
diff --git a/sources b/sources
index 9613087..5d2a21d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1e768f2b1edc8613911b1d33bb361a7f  intel-gpu-tools-1.9.tar.bz2
-c02f8be85e6d9269db3be6cf46b184fc  xf86-video-intel-20160512.tar.bz2
+85765d544dabad81277b0820f0fc7798  xf86-video-intel-20160712.tar.bz2
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index f724d1e..28ae6dd 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -1,7 +1,7 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsver 1.9
-%define gitdate 20160512
+%define gitdate 20160712
 %define gitrev .%{gitdate}
 
 %undefine _hardened_build
@@ -28,7 +28,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.99.917
-Release:   23%{?gitrev}%{?dist}
+Release:   24%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -44,7 +44,10 @@ Source4:    make-git-snapshot.sh
 
 Patch0:	    intel-gcc-pr65873.patch
 Patch1:	    igt-stat.patch
+# Fedora specific modification: Do not use intel driver for skylake+
+# The intel driver is too much of a moving target / too buggy.
 Patch2:     0001-sna-Let-modestting-glamor-handle-gen9.patch
+# Bugfix, send upstream
 Patch3:     0002-Fix-fd-and-mem-leak-when-intel_scrn_create-fails.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
@@ -176,6 +179,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Tue Jul 12 2016 Hans de Goede <hdegoede@redhat.com> - 2.99.917-24.20160712
+- Git snapshot du jour, bringing in a bunch of bugfixes
+- Fix dpi issues on Surface 3 (also needs some kernel fixes)
+- Hopefully fix rhbz#1354124
+
 * Thu May 12 2016 Hans de Goede <hdegoede@redhat.com> - 2.99.917-23.20160512
 - Update to 20160512 snapshot
 - This fixes laptops with switchable graphics hanging after a dpms off of