[arch-commits] Commit in xf86-video-intel/repos (8 files)
Laurent Carlier
lcarlier at nymeria.archlinux.org
Sun Jul 13 12:01:25 UTC 2014
Date: Sunday, July 13, 2014 @ 14:01:24
Author: lcarlier
Revision: 216852
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xf86-video-intel/repos/testing-i686/
xf86-video-intel/repos/testing-i686/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
(from rev 216851, xf86-video-intel/trunk/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch)
xf86-video-intel/repos/testing-i686/PKGBUILD
(from rev 216851, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/testing-i686/xf86-video-intel.install
(from rev 216851, xf86-video-intel/trunk/xf86-video-intel.install)
xf86-video-intel/repos/testing-x86_64/
xf86-video-intel/repos/testing-x86_64/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
(from rev 216851, xf86-video-intel/trunk/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch)
xf86-video-intel/repos/testing-x86_64/PKGBUILD
(from rev 216851, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install
(from rev 216851, xf86-video-intel/trunk/xf86-video-intel.install)
--------------------------------------------------------------------------------+
testing-i686/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch | 56 +++++++++
testing-i686/PKGBUILD | 58 ++++++++++
testing-i686/xf86-video-intel.install | 22 +++
testing-x86_64/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch | 56 +++++++++
testing-x86_64/PKGBUILD | 58 ++++++++++
testing-x86_64/xf86-video-intel.install | 22 +++
6 files changed, 272 insertions(+)
Copied: xf86-video-intel/repos/testing-i686/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch (from rev 216851, xf86-video-intel/trunk/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch)
===================================================================
--- testing-i686/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch (rev 0)
+++ testing-i686/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch 2014-07-13 12:01:24 UTC (rev 216852)
@@ -0,0 +1,56 @@
+From e2bfa715a9e115921263d572b9f4c496b550a494 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Tue, 10 Jun 2014 21:28:32 +0100
+Subject: [PATCH] sna/dri2: Check that the window covers the whole CRTC before
+ xchg
+
+Fixes TearFre regression from
+
+commit 3932e97057fca16615adaefbc1eb25a0d51a1d8b [2.99.912]
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Mon Jun 9 08:58:15 2014 +0100
+
+ sna/dri2: Allow TearFree flipping to individual CRTC
+
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_display.c | 1 +
+ src/sna/sna_dri2.c | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index dcbe622..7169779 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -332,6 +332,7 @@ static unsigned get_fb(struct sna *sna, struct kgem_bo *bo,
+ assert(bo->refcnt);
+ assert(bo->proxy == NULL);
+ assert(!bo->snoop);
++ assert(8*bo->pitch >= width * scrn->bitsPerPixel);
+ assert(height * bo->pitch <= kgem_bo_size(bo)); /* XXX crtc offset */
+ if (bo->delta) {
+ DBG(("%s: reusing fb=%d for handle=%d\n",
+diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
+index 1baaf2b..e196464 100644
+--- a/src/sna/sna_dri2.c
++++ b/src/sna/sna_dri2.c
+@@ -1605,6 +1605,16 @@ can_xchg_one(struct sna *sna,
+ return false;
+ }
+
++ if (memcmp(&win->clipList.extents, &crtc->bounds, sizeof(crtc->bounds))) {
++ DBG(("%s: no, window [(%d, %d), (%d, %d)] does not cover CRTC [(%d, %d), (%d, %d)]\n",
++ __FUNCTION__,
++ win->clipList.extents.x1, win->clipList.extents.y1,
++ win->clipList.extents.x2, win->clipList.extents.y2,
++ crtc->bounds.x1, crtc->bounds.y1,
++ crtc->bounds.x2, crtc->bounds.y2));
++ return false;
++ }
++
+ if (sna_crtc_is_transformed(crtc)) {
+ DBG(("%s: no, CRTC is rotated\n", __FUNCTION__));
+ return false;
+--
+2.0.1
+
Copied: xf86-video-intel/repos/testing-i686/PKGBUILD (from rev 216851, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-07-13 12:01:24 UTC (rev 216852)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.912
+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' 'glamor-egl')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' '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.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
+ '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
+ 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch)
+sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501'
+ '19fe39fa5cd175e14f77d67dbd731f992c8f51161d90b73c63f52604a9eed7ce')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # fix FS#40863, merged upstream
+ patch -Np1 -i ../0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --enable-glamor
+ 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/testing-i686/xf86-video-intel.install (from rev 216851, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- testing-i686/xf86-video-intel.install (rev 0)
+++ testing-i686/xf86-video-intel.install 2014-07-13 12:01:24 UTC (rev 216852)
@@ -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
+}
+
Copied: xf86-video-intel/repos/testing-x86_64/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch (from rev 216851, xf86-video-intel/trunk/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch)
===================================================================
--- testing-x86_64/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch (rev 0)
+++ testing-x86_64/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch 2014-07-13 12:01:24 UTC (rev 216852)
@@ -0,0 +1,56 @@
+From e2bfa715a9e115921263d572b9f4c496b550a494 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Tue, 10 Jun 2014 21:28:32 +0100
+Subject: [PATCH] sna/dri2: Check that the window covers the whole CRTC before
+ xchg
+
+Fixes TearFre regression from
+
+commit 3932e97057fca16615adaefbc1eb25a0d51a1d8b [2.99.912]
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Mon Jun 9 08:58:15 2014 +0100
+
+ sna/dri2: Allow TearFree flipping to individual CRTC
+
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_display.c | 1 +
+ src/sna/sna_dri2.c | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index dcbe622..7169779 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -332,6 +332,7 @@ static unsigned get_fb(struct sna *sna, struct kgem_bo *bo,
+ assert(bo->refcnt);
+ assert(bo->proxy == NULL);
+ assert(!bo->snoop);
++ assert(8*bo->pitch >= width * scrn->bitsPerPixel);
+ assert(height * bo->pitch <= kgem_bo_size(bo)); /* XXX crtc offset */
+ if (bo->delta) {
+ DBG(("%s: reusing fb=%d for handle=%d\n",
+diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
+index 1baaf2b..e196464 100644
+--- a/src/sna/sna_dri2.c
++++ b/src/sna/sna_dri2.c
+@@ -1605,6 +1605,16 @@ can_xchg_one(struct sna *sna,
+ return false;
+ }
+
++ if (memcmp(&win->clipList.extents, &crtc->bounds, sizeof(crtc->bounds))) {
++ DBG(("%s: no, window [(%d, %d), (%d, %d)] does not cover CRTC [(%d, %d), (%d, %d)]\n",
++ __FUNCTION__,
++ win->clipList.extents.x1, win->clipList.extents.y1,
++ win->clipList.extents.x2, win->clipList.extents.y2,
++ crtc->bounds.x1, crtc->bounds.y1,
++ crtc->bounds.x2, crtc->bounds.y2));
++ return false;
++ }
++
+ if (sna_crtc_is_transformed(crtc)) {
+ DBG(("%s: no, CRTC is rotated\n", __FUNCTION__));
+ return false;
+--
+2.0.1
+
Copied: xf86-video-intel/repos/testing-x86_64/PKGBUILD (from rev 216851, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-07-13 12:01:24 UTC (rev 216852)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.912
+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' 'glamor-egl')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' '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.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
+ '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
+ 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch)
+sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501'
+ '19fe39fa5cd175e14f77d67dbd731f992c8f51161d90b73c63f52604a9eed7ce')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # fix FS#40863, merged upstream
+ patch -Np1 -i ../0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --enable-glamor
+ 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/testing-x86_64/xf86-video-intel.install (from rev 216851, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- testing-x86_64/xf86-video-intel.install (rev 0)
+++ testing-x86_64/xf86-video-intel.install 2014-07-13 12:01:24 UTC (rev 216852)
@@ -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