[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)

[Laurent Carlier]

    Date: Tuesday, April 14, 2015 @ 14:04:37
  Author: lcarlier
Revision: 236531

upgpkg: xf86-video-intel 2.99.917-5

fix FS#43534

Modified:
  xf86-video-intel/trunk/PKGBUILD
  xf86-video-intel/trunk/git-fixes.patch

-----------------+
 PKGBUILD        |    4 ++--
 git-fixes.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-14 11:30:10 UTC (rev 236530)
+++ PKGBUILD	2015-04-14 12:04:37 UTC (rev 236531)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.99.917
-pkgrel=4
+pkgrel=5
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -26,7 +26,7 @@
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
         git-fixes.patch)
 sha256sums=('00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9'
-            '9216b69b7e01b6910b4758c4e346d84a43198ee516f6b239bf43c4e172a9c922')
+            '3b38b844fbc8088401ebbbafbbf1399d87f077caa5020cbd822487b7d26514e0')
 
 prepare() {
   cd ${pkgname}-${pkgver}

Modified: git-fixes.patch
===================================================================
--- git-fixes.patch	2015-04-14 11:30:10 UTC (rev 236530)
+++ git-fixes.patch	2015-04-14 12:04:37 UTC (rev 236531)
@@ -125,4 +125,51 @@
  	if (sna->flags & SNA_IS_HOSTED)
 -- 
 cgit v0.10.2
+From 9c109f3dc56621215e580e74a6161f00035bdac3 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Sun, 12 Apr 2015 21:15:54 +0100
+Subject: [PATCH] sna: Mark the GPU as available before doing the mode restore
+ on VT enter
 
+Sometimes we want to render with the GPU when doing a mode switch, e.g.
+if we need to initialise an output surface. To do so, we need to prepare
+the acceleration layer first.
+
+Lots of thanks to Vasily for tracking this one down.
+
+Reported-by: Vasily Khoruzhick <anarsoul at gmail.com>
+Bugzilla: https://bugs.archlinux.org/task/43534
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_driver.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 31500e7..488ca9b 100644
+--- a/src/sna/sna_driver.c
++++ b/src/sna/sna_driver.c
+@@ -1213,6 +1213,8 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
+ 	if (intel_get_master(sna->dev))
+ 		return FALSE;
+ 
++	sna_accel_enter(sna);
++
+ 	if (sna->flags & SNA_REPROBE) {
+ 		DBG(("%s: reporting deferred hotplug event\n", __FUNCTION__));
+ 		sna_mode_discover(sna);
+@@ -1221,11 +1223,11 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
+ 	sna_mode_check(sna);
+ 
+ 	if (!sna_set_desired_mode(sna)) {
++		sna_accel_leave(sna);
+ 		intel_put_master(sna->dev);
+ 		return FALSE;
+ 	}
+ 
+-	sna_accel_enter(sna);
+ 	return TRUE;
+ }
+ 
+-- 
+2.3.5
+