[arch-commits] Commit in xf86-video-intel/repos (14 files)
Laurent Carlier
lcarlier at archlinux.org
Fri Aug 1 12:43:09 UTC 2014
Date: Friday, August 1, 2014 @ 14:43:09
Author: lcarlier
Revision: 218490
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-intel/repos/extra-i686/PKGBUILD
(from rev 218489, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/extra-i686/fix-i810-segfault-2.99.914.patch
(from rev 218489, xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch)
xf86-video-intel/repos/extra-i686/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
(from rev 218489, xf86-video-intel/trunk/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
xf86-video-intel/repos/extra-i686/xf86-video-intel.install
(from rev 218489, xf86-video-intel/trunk/xf86-video-intel.install)
xf86-video-intel/repos/extra-x86_64/PKGBUILD
(from rev 218489, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/extra-x86_64/fix-i810-segfault-2.99.914.patch
(from rev 218489, xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch)
xf86-video-intel/repos/extra-x86_64/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
(from rev 218489, xf86-video-intel/trunk/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install
(from rev 218489, xf86-video-intel/trunk/xf86-video-intel.install)
Deleted:
xf86-video-intel/repos/extra-i686/PKGBUILD
xf86-video-intel/repos/extra-i686/fix-i810-segfault-2.99.914.patch
xf86-video-intel/repos/extra-i686/xf86-video-intel.install
xf86-video-intel/repos/extra-x86_64/PKGBUILD
xf86-video-intel/repos/extra-x86_64/fix-i810-segfault-2.99.914.patch
xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install
-------------------------------------------------------------------------+
/PKGBUILD | 124 ++++++++++
/fix-i810-segfault-2.99.914.patch | 62 +++++
/xf86-video-intel.install | 44 +++
extra-i686/PKGBUILD | 59 ----
extra-i686/fix-i810-segfault-2.99.914.patch | 31 --
extra-i686/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch | 47 +++
extra-i686/xf86-video-intel.install | 22 -
extra-x86_64/PKGBUILD | 59 ----
extra-x86_64/fix-i810-segfault-2.99.914.patch | 31 --
extra-x86_64/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch | 47 +++
extra-x86_64/xf86-video-intel.install | 22 -
11 files changed, 324 insertions(+), 224 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-08-01 12:42:47 UTC (rev 218489)
+++ extra-i686/PKGBUILD 2014-08-01 12:43:09 UTC (rev 218490)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.99.914
-pkgrel=2
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-install=$pkgname.install
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'libx11' 'libxrender'
- # additional deps for intel-virtual-output
- 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
-optdepends=('libxrandr: for intel-virtual-output'
- 'libxinerama: for intel-virtual-output'
- 'libxcursor: for intel-virtual-output'
- 'libxtst: for intel-virtual-output')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-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
- 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
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib \
- --enable-glamor \
- --disable-dri3
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-intel/repos/extra-i686/PKGBUILD (from rev 218489, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-08-01 12:43:09 UTC (rev 218490)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.914
+pkgrel=3
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+install=$pkgname.install
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'libx11' 'libxrender'
+ # additional deps for intel-virtual-output
+ 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
+optdepends=('libxrandr: for intel-virtual-output'
+ 'libxinerama: for intel-virtual-output'
+ 'libxcursor: for intel-virtual-output'
+ 'libxtst: for intel-virtual-output')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+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
+ fix-i810-segfault-2.99.914.patch
+ sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
+sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
+ 'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
+ 'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix segfaulting on i810 chipsets - merged upstream
+ patch -Np1 -i ../fix-i810-segfault-2.99.914.patch
+ # fix FS#40949 - merged upstream
+ patch -Np1 -i ../sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --enable-glamor \
+ --disable-dri3
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-i686/fix-i810-segfault-2.99.914.patch
===================================================================
--- extra-i686/fix-i810-segfault-2.99.914.patch 2014-08-01 12:42:47 UTC (rev 218489)
+++ extra-i686/fix-i810-segfault-2.99.914.patch 2014-08-01 12:43:09 UTC (rev 218490)
@@ -1,31 +0,0 @@
-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
Copied: xf86-video-intel/repos/extra-i686/fix-i810-segfault-2.99.914.patch (from rev 218489, xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch)
===================================================================
--- extra-i686/fix-i810-segfault-2.99.914.patch (rev 0)
+++ extra-i686/fix-i810-segfault-2.99.914.patch 2014-08-01 12:43:09 UTC (rev 218490)
@@ -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
Copied: xf86-video-intel/repos/extra-i686/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch (from rev 218489, xf86-video-intel/trunk/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
===================================================================
--- extra-i686/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch (rev 0)
+++ extra-i686/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch 2014-08-01 12:43:09 UTC (rev 218490)
@@ -0,0 +1,47 @@
+From fc2de62496061b9d0bace02729765344bd939122 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri, 1 Aug 2014 12:00:05 +0100
+Subject: [PATCH 1/2] sna/glyphs: Fallback to masked glyphs if rendering to a
+ too wide dst
+
+Fixes regression from
+
+commit 79399ff9264ff23da0ab95131a67d2ac85651b3d
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Mon Mar 24 10:46:57 2014 +0000
+
+ sna: Eliminate a few conditionals in glyph fast path
+
+for large pixmaps (such as extended desktops on gen2/gen3).
+
+Bugzilla: https://bugs.archlinux.org/task/40949
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_glyphs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
+index 0bb72d8..5d3bec2 100644
+--- a/src/sna/sna_glyphs.c
++++ b/src/sna/sna_glyphs.c
+@@ -800,7 +800,7 @@ glyphs0_to_dst(struct sna *sna,
+ 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ COMPOSITE_PARTIAL, &tmp))
+- goto next_glyph_N;
++ return false;
+
+ glyph_atlas = p->atlas;
+ }
+@@ -892,7 +892,7 @@ next_glyph_N:
+ 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ COMPOSITE_PARTIAL, &tmp))
+- goto next_glyph_0;
++ return false;
+
+ glyph_atlas = p->atlas;
+ }
+--
+2.0.3
+
Deleted: extra-i686/xf86-video-intel.install
===================================================================
--- extra-i686/xf86-video-intel.install 2014-08-01 12:42:47 UTC (rev 218489)
+++ extra-i686/xf86-video-intel.install 2014-08-01 12:43:09 UTC (rev 218490)
@@ -1,22 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.21.15) < 0 )); then
- post_install
- fi
-}
-
-post_install() {
- cat <<MSG
->>> This driver uses SNA as the default acceleration method. You can
- fall back to UXA if you run into trouble or test experimental
- Glamor acceleration. To do so, save a file with the following
- content as /etc/X11/xorg.conf.d/20-intel.conf :
- Section "Device"
- Identifier "Intel Graphics"
- Driver "intel"
- Option "AccelMethod" "sna"
- #Option "AccelMethod" "uxa"
- #Option "AccelMethod" "glamor"
- EndSection
-MSG
-}
-
Copied: xf86-video-intel/repos/extra-i686/xf86-video-intel.install (from rev 218489, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- extra-i686/xf86-video-intel.install (rev 0)
+++ extra-i686/xf86-video-intel.install 2014-08-01 12:43:09 UTC (rev 218490)
@@ -0,0 +1,22 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.21.15) < 0 )); then
+ post_install
+ fi
+}
+
+post_install() {
+ cat <<MSG
+>>> This driver uses SNA as the default acceleration method. You can
+ fall back to UXA if you run into trouble or test experimental
+ Glamor acceleration. To do so, save a file with the following
+ content as /etc/X11/xorg.conf.d/20-intel.conf :
+ Section "Device"
+ Identifier "Intel Graphics"
+ Driver "intel"
+ Option "AccelMethod" "sna"
+ #Option "AccelMethod" "uxa"
+ #Option "AccelMethod" "glamor"
+ EndSection
+MSG
+}
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-08-01 12:42:47 UTC (rev 218489)
+++ extra-x86_64/PKGBUILD 2014-08-01 12:43:09 UTC (rev 218490)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.99.914
-pkgrel=2
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-install=$pkgname.install
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'libx11' 'libxrender'
- # additional deps for intel-virtual-output
- 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
-optdepends=('libxrandr: for intel-virtual-output'
- 'libxinerama: for intel-virtual-output'
- 'libxcursor: for intel-virtual-output'
- 'libxtst: for intel-virtual-output')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-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
- 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
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib \
- --enable-glamor \
- --disable-dri3
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-intel/repos/extra-x86_64/PKGBUILD (from rev 218489, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-08-01 12:43:09 UTC (rev 218490)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.914
+pkgrel=3
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+install=$pkgname.install
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'libx11' 'libxrender'
+ # additional deps for intel-virtual-output
+ 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
+optdepends=('libxrandr: for intel-virtual-output'
+ 'libxinerama: for intel-virtual-output'
+ 'libxcursor: for intel-virtual-output'
+ 'libxtst: for intel-virtual-output')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+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
+ fix-i810-segfault-2.99.914.patch
+ sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
+sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
+ 'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
+ 'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix segfaulting on i810 chipsets - merged upstream
+ patch -Np1 -i ../fix-i810-segfault-2.99.914.patch
+ # fix FS#40949 - merged upstream
+ patch -Np1 -i ../sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --enable-glamor \
+ --disable-dri3
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-x86_64/fix-i810-segfault-2.99.914.patch
===================================================================
--- extra-x86_64/fix-i810-segfault-2.99.914.patch 2014-08-01 12:42:47 UTC (rev 218489)
+++ extra-x86_64/fix-i810-segfault-2.99.914.patch 2014-08-01 12:43:09 UTC (rev 218490)
@@ -1,31 +0,0 @@
-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
Copied: xf86-video-intel/repos/extra-x86_64/fix-i810-segfault-2.99.914.patch (from rev 218489, xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch)
===================================================================
--- extra-x86_64/fix-i810-segfault-2.99.914.patch (rev 0)
+++ extra-x86_64/fix-i810-segfault-2.99.914.patch 2014-08-01 12:43:09 UTC (rev 218490)
@@ -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
Copied: xf86-video-intel/repos/extra-x86_64/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch (from rev 218489, xf86-video-intel/trunk/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
===================================================================
--- extra-x86_64/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch (rev 0)
+++ extra-x86_64/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch 2014-08-01 12:43:09 UTC (rev 218490)
@@ -0,0 +1,47 @@
+From fc2de62496061b9d0bace02729765344bd939122 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri, 1 Aug 2014 12:00:05 +0100
+Subject: [PATCH 1/2] sna/glyphs: Fallback to masked glyphs if rendering to a
+ too wide dst
+
+Fixes regression from
+
+commit 79399ff9264ff23da0ab95131a67d2ac85651b3d
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Mon Mar 24 10:46:57 2014 +0000
+
+ sna: Eliminate a few conditionals in glyph fast path
+
+for large pixmaps (such as extended desktops on gen2/gen3).
+
+Bugzilla: https://bugs.archlinux.org/task/40949
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_glyphs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
+index 0bb72d8..5d3bec2 100644
+--- a/src/sna/sna_glyphs.c
++++ b/src/sna/sna_glyphs.c
+@@ -800,7 +800,7 @@ glyphs0_to_dst(struct sna *sna,
+ 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ COMPOSITE_PARTIAL, &tmp))
+- goto next_glyph_N;
++ return false;
+
+ glyph_atlas = p->atlas;
+ }
+@@ -892,7 +892,7 @@ next_glyph_N:
+ 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ COMPOSITE_PARTIAL, &tmp))
+- goto next_glyph_0;
++ return false;
+
+ glyph_atlas = p->atlas;
+ }
+--
+2.0.3
+
Deleted: extra-x86_64/xf86-video-intel.install
===================================================================
--- extra-x86_64/xf86-video-intel.install 2014-08-01 12:42:47 UTC (rev 218489)
+++ extra-x86_64/xf86-video-intel.install 2014-08-01 12:43:09 UTC (rev 218490)
@@ -1,22 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.21.15) < 0 )); then
- post_install
- fi
-}
-
-post_install() {
- cat <<MSG
->>> This driver uses SNA as the default acceleration method. You can
- fall back to UXA if you run into trouble or test experimental
- Glamor acceleration. To do so, save a file with the following
- content as /etc/X11/xorg.conf.d/20-intel.conf :
- Section "Device"
- Identifier "Intel Graphics"
- Driver "intel"
- Option "AccelMethod" "sna"
- #Option "AccelMethod" "uxa"
- #Option "AccelMethod" "glamor"
- EndSection
-MSG
-}
-
Copied: xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install (from rev 218489, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- extra-x86_64/xf86-video-intel.install (rev 0)
+++ extra-x86_64/xf86-video-intel.install 2014-08-01 12:43:09 UTC (rev 218490)
@@ -0,0 +1,22 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.21.15) < 0 )); then
+ post_install
+ fi
+}
+
+post_install() {
+ cat <<MSG
+>>> This driver uses SNA as the default acceleration method. You can
+ fall back to UXA if you run into trouble or test experimental
+ Glamor acceleration. To do so, save a file with the following
+ content as /etc/X11/xorg.conf.d/20-intel.conf :
+ Section "Device"
+ Identifier "Intel Graphics"
+ Driver "intel"
+ Option "AccelMethod" "sna"
+ #Option "AccelMethod" "uxa"
+ #Option "AccelMethod" "glamor"
+ EndSection
+MSG
+}
+
More information about the arch-commits
mailing list