[arch-commits] Commit in xf86-video-intel/trunk (2 files)

Tobias Powalowski tpowa at archlinux.org
Thu Jul 31 15:36:36 UTC 2014


    Date: Thursday, July 31, 2014 @ 17:36:36
  Author: tpowa
Revision: 218457

upgpkg: xf86-video-intel 2.99.914-2

fix i810 startup segfault

Added:
  xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch
Modified:
  xf86-video-intel/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   11 +++++++----
 fix-i810-segfault-2.99.914.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-31 15:35:34 UTC (rev 218456)
+++ PKGBUILD	2014-07-31 15:36:36 UTC (rev 218457)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.99.914
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -23,12 +23,15 @@
 conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        fix-i810-segfault-2.99.914.patch)
+sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
+            'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-
+  # fix segfaulting on i810 chipsets
+  patch -Np1 -i ../fix-i810-segfault-2.99.914.patch
 #  autoreconf -fiv
 }
 

Added: fix-i810-segfault-2.99.914.patch
===================================================================
--- fix-i810-segfault-2.99.914.patch	                        (rev 0)
+++ fix-i810-segfault-2.99.914.patch	2014-07-31 15:36:36 UTC (rev 218457)
@@ -0,0 +1,31 @@
+From ce804875914f52dba5356f8aefec850d411b051a Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Thu, 31 Jul 2014 15:18:02 +0000
+Subject: i810: Fix startup after marking GPU screens in the module
+
+Fixes regression from
+
+commit d6830190bc9956f485db6c3420f7a4a79793a693
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date:   Wed Jul 23 10:53:40 2014 +0100
+
+    sna: Disable all outputs when initializing as a slaved output provider
+
+Reported-by: Tobias Powalowski
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
+index a1b73fd..3d53d04 100644
+--- a/src/legacy/i810/i810_driver.c
++++ b/src/legacy/i810/i810_driver.c
+@@ -152,7 +152,7 @@ static int i810_pitches[] = {
+ static Bool
+ I810GetRec(ScrnInfoPtr scrn)
+ {
+-   if (((uintptr_t)scrn->driverPrivate & 1) == 0)
++   if (((uintptr_t)scrn->driverPrivate & 3) == 0)
+       return TRUE;
+ 
+    scrn->driverPrivate = xnfcalloc(sizeof(I810Rec), 1);
+--
+cgit v0.9.0.2-2-gbebe




More information about the arch-commits mailing list