[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Monday, September 30, 2019 @ 18:05:44
Author: andyrtr
Revision: 363581
upgpkg: xf86-video-intel 1:2.99.917+892+gc6cb1b19-1
update to recent git commits
Modified:
xf86-video-intel/trunk/PKGBUILD
Deleted:
xf86-video-intel/trunk/0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch
+
0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch | 93 ---
PKGBUILD | 17 --
2 files changed, 5 insertions(+), 105 deletions(-)
Deleted: 0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch
===
--- 0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch 2019-09-30
17:34:48 UTC (rev 363580)
+++ 0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch 2019-09-30
18:05:44 UTC (rev 363581)
@@ -1,93 +0,0 @@
-From e85424325911626556fbe5a313c698a5da701163 Mon Sep 17 00:00:00 2001
-From: Peter Wu
-Date: Mon, 13 Aug 2018 22:59:50 +0200
-Subject: [PATCH xf86-video-intel] SNA: fix PRIME output support since xserver
- 1.20
-
-Since xorg-server 1.20, an external monitor would remain blank when used
-in a PRIME output slave setup. Only a cursor was visible. The cause is
-"Make PixmapDirtyUpdateRec::src a DrawablePtr" in xserver, the "src"
-pointer might point to the root window (created by the server) instead
-of a pixmap (as created by xf86-video-intel). Use get_drawable_pixmap to
-handle both cases.
-
-When built with -fsanitize=address, the following test will trigger a
-heap-buffer-overflow error due to to_sna_from_pixmap receiving a window
-instead of a pixmap.
-
-Test on a hybrid graphics laptop (Intel + modesetting/nouveau):
-
-xrandr --setprovideroutputsource modesetting Intel
-xrandr --output DP-1-1 --mode 2560x1440 # should not crash
-glxgears # should display gears on both screens
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100086
-Signed-off-by: Peter Wu
-Tested with xserver 1.20.1 with ASAN enabled. Survives multiple
-resolution changes, works with a Plasma desktop session, it seems
-stable. Something like this patch is required to make multi-monitor
-setups usable in a hybrid graphics setting with Xorg 1.20.
- src/sna/sna_accel.c | 18 ++
- 1 file changed, 18 insertions(+)
-
-diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
-index 2f669bcf..80b116a3 100644
a/src/sna/sna_accel.c
-+++ b/src/sna/sna_accel.c
-@@ -17510,7 +17510,11 @@ static bool has_offload_slaves(struct sna *sna)
- PixmapDirtyUpdatePtr dirty;
-
- xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
-+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
-+ assert(dirty->src == &sna->front->drawable);
-+#else
- assert(dirty->src == sna->front);
-+#endif
- if (RegionNotEmpty(DamageRegion(dirty->damage)))
- return true;
- }
-@@ -17671,7 +17675,11 @@ static void sna_accel_post_damage(struct sna *sna)
- if (RegionNil(damage))
- continue;
-
-+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
-+ src = get_drawable_pixmap(dirty->src);
-+#else
- src = dirty->src;
-+#endif
- dst = dirty->slave_dst->master_pixmap;
-
- region.extents.x1 = dirty->x;
-@@ -17922,9 +17930,15 @@ migrate_dirty_tracking(PixmapPtr old_front, PixmapPtr
new_front)
- PixmapDirtyUpdatePtr dirty, safe;
-
- xorg_list_for_each_entry_safe(dirty, safe, &screen->pixmap_dirty_list,
ent) {
-+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
-+ assert(dirty->src == &old_front->drawable);
-+ if (dirty->src != &old_front->drawable)
-+ continue;
-+#else
- assert(dirty->src == old_front);
- if (dirty->src != old_front)
- continue;
-+#endif
-
- DamageUnregister(&dirty->src->drawable, dirty->damage);
- DamageDestroy(dirty->damage);
-@@ -17939,7 +17953,11 @@ migrate_dirty_tracking(PixmapPtr old_front, PixmapPtr
new_front)
- }
-
- DamageRegister(&new_front->drawable, dirty->damage);
-+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
-+ dirty->src = &new_front->drawable;
-+#else
- dirty->src = new_front;
-+#endif
- }
- #endif
- }
---
-2.18.0
-
Modified: PKGBUILD
===
--- PKGBUILD2019-09-30 17:34:48 UTC (rev 363580)
+++ PKGBUILD2019-09-30 18:05:44 UTC (rev 363581)
@@ -3,8 +3,8 @@
pkgname=xf86-video-intel
# https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/log/
-_commit=6f4972d5c368c30e971a23c1dc370d3e43761282 # master
-pkgver=2.99.917+870+g6f4972d5
+_commit=c6cb1b199598c572484fb4e30e1026be9d4ccc31 # master
+pkgver=2.99.917+892+gc6cb1b19
pkgrel=1
epoch=1
arch=(x86_64)
@@ -13,7 +13,7 @@
install=$pkgname.i
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Wednesday, September 5, 2018 @ 06:14:44
Author: andyrtr
Revision: 333418
upgpkg: xf86-video-intel 1:2.99.917+842+g3d395062-1
update to latest git commit, apply patch for multi monitor output - FS#58895
Added:
xf86-video-intel/trunk/0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
+
0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch | 93 +++
PKGBUILD | 16 +
2 files changed, 104 insertions(+), 5 deletions(-)
Added: 0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch
===
--- 0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch
(rev 0)
+++ 0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch 2018-09-05
06:14:44 UTC (rev 333418)
@@ -0,0 +1,93 @@
+From e85424325911626556fbe5a313c698a5da701163 Mon Sep 17 00:00:00 2001
+From: Peter Wu
+Date: Mon, 13 Aug 2018 22:59:50 +0200
+Subject: [PATCH xf86-video-intel] SNA: fix PRIME output support since xserver
+ 1.20
+
+Since xorg-server 1.20, an external monitor would remain blank when used
+in a PRIME output slave setup. Only a cursor was visible. The cause is
+"Make PixmapDirtyUpdateRec::src a DrawablePtr" in xserver, the "src"
+pointer might point to the root window (created by the server) instead
+of a pixmap (as created by xf86-video-intel). Use get_drawable_pixmap to
+handle both cases.
+
+When built with -fsanitize=address, the following test will trigger a
+heap-buffer-overflow error due to to_sna_from_pixmap receiving a window
+instead of a pixmap.
+
+Test on a hybrid graphics laptop (Intel + modesetting/nouveau):
+
+xrandr --setprovideroutputsource modesetting Intel
+xrandr --output DP-1-1 --mode 2560x1440 # should not crash
+glxgears # should display gears on both screens
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100086
+Signed-off-by: Peter Wu
+---
+Tested with xserver 1.20.1 with ASAN enabled. Survives multiple
+resolution changes, works with a Plasma desktop session, it seems
+stable. Something like this patch is required to make multi-monitor
+setups usable in a hybrid graphics setting with Xorg 1.20.
+---
+ src/sna/sna_accel.c | 18 ++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 2f669bcf..80b116a3 100644
+--- a/src/sna/sna_accel.c
b/src/sna/sna_accel.c
+@@ -17510,7 +17510,11 @@ static bool has_offload_slaves(struct sna *sna)
+ PixmapDirtyUpdatePtr dirty;
+
+ xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
++#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
++ assert(dirty->src == &sna->front->drawable);
++#else
+ assert(dirty->src == sna->front);
++#endif
+ if (RegionNotEmpty(DamageRegion(dirty->damage)))
+ return true;
+ }
+@@ -17671,7 +17675,11 @@ static void sna_accel_post_damage(struct sna *sna)
+ if (RegionNil(damage))
+ continue;
+
++#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
++ src = get_drawable_pixmap(dirty->src);
++#else
+ src = dirty->src;
++#endif
+ dst = dirty->slave_dst->master_pixmap;
+
+ region.extents.x1 = dirty->x;
+@@ -17922,9 +17930,15 @@ migrate_dirty_tracking(PixmapPtr old_front, PixmapPtr
new_front)
+ PixmapDirtyUpdatePtr dirty, safe;
+
+ xorg_list_for_each_entry_safe(dirty, safe, &screen->pixmap_dirty_list,
ent) {
++#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
++ assert(dirty->src == &old_front->drawable);
++ if (dirty->src != &old_front->drawable)
++ continue;
++#else
+ assert(dirty->src == old_front);
+ if (dirty->src != old_front)
+ continue;
++#endif
+
+ DamageUnregister(&dirty->src->drawable, dirty->damage);
+ DamageDestroy(dirty->damage);
+@@ -17939,7 +17953,11 @@ migrate_dirty_tracking(PixmapPtr old_front, PixmapPtr
new_front)
+ }
+
+ DamageRegister(&new_front->drawable, dirty->damage);
++#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
++ dirty->src = &new_front->drawable;
++#else
+ dirty->src = new_front;
++#endif
+ }
+ #endif
+ }
+--
+2.18.0
+
Modified: PKGBUILD
===
--- PKGBUILD2018-09-05 05:55:36 UTC (rev 333417)
+++ PKGBUILD2018-09-05 06:14:44 UTC (rev 333418)
@@ -3,8 +3,8 @@
# Maintainer: Jan de Groot
pkgname=xf86-video-intel
-_commit=e7bfc9065345085f767235eea8b148c356e5bd2b # master
-pkgver=2.99.917+831+ge7bfc906
+_commit=3d395062ce73f85e8340218df01c2ebf4bc25023 # master
+pkgver=2.99.917+842+g3d395062
pkgrel=1
epoch=1
arch=(x86_64)
@@ -28,8 +28,10 @@
conflicts=('xo
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Sunday, December 21, 2014 @ 19:42:44
Author: andyrtr
Revision: 227911
upgpkg: xf86-video-intel 2.99.917-1
upstream update 2.99.917
Modified:
xf86-video-intel/trunk/PKGBUILD
Deleted:
xf86-video-intel/trunk/0001-sna-Use-default-monitor-options-on-the-first-output.patch
+
0001-sna-Use-default-monitor-options-on-the-first-output.patch | 37
--
PKGBUILD | 17 +---
2 files changed, 4 insertions(+), 50 deletions(-)
Deleted: 0001-sna-Use-default-monitor-options-on-the-first-output.patch
===
--- 0001-sna-Use-default-monitor-options-on-the-first-output.patch
2014-12-21 18:38:13 UTC (rev 227910)
+++ 0001-sna-Use-default-monitor-options-on-the-first-output.patch
2014-12-21 18:42:44 UTC (rev 227911)
@@ -1,37 +0,0 @@
-From 1aefd16964c30264c05d136cef3e1e7de5eb9c53 Mon Sep 17 00:00:00 2001
-From: Chris Wilson
-Date: Fri, 12 Sep 2014 07:46:43 +0100
-Subject: [PATCH] sna: Use default monitor options on the first output
-
-commit 6554cf0a69f04710b64f3488384fe5cb2748dc35
-Author: Chris Wilson
-Date: Mon Aug 11 12:22:17 2014 +0100
-
-sna: Parse output options early during initialisation
-
-rearranged the monitor query to before the num_outputs increment. The
-result was that it choose the second output as the default and not the
-intended first.
-
-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=522500
-Signed-off-by: Chris Wilson
- src/sna/sna_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index f136c20..f6cfc80 100644
a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -3751,7 +3751,7 @@ sna_output_add(struct sna *sna, unsigned id, unsigned
serial)
- output->name = (char *)(output + 1);
- memcpy(output->name, name, len + 1);
-
-- output->use_screen_monitor = config->num_output != 1;
-+ output->use_screen_monitor = config->num_output != 0;
- xf86OutputUseScreenMonitor(output, !output->use_screen_monitor);
- assert(output->options);
-
---
-2.1.0
-
Modified: PKGBUILD
===
--- PKGBUILD2014-12-21 18:38:13 UTC (rev 227910)
+++ PKGBUILD2014-12-21 18:42:44 UTC (rev 227911)
@@ -3,8 +3,8 @@
# Maintainer: Jan de Groot
pkgname=xf86-video-intel
-pkgver=2.99.916
-pkgrel=3
+pkgver=2.99.917
+pkgrel=1
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
license=('custom')
@@ -23,18 +23,9 @@
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
-0001-sna-Use-default-monitor-options-on-the-first-output.patch)
-sha256sums=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01'
-'0195f5e5e69fc4b86d7ab51bc3d297e283cbdaec5c729702cca1b213809b4a18')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9')
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # Fix FS#41944 merged upstream
- patch -Np1 -i
../0001-sna-Use-default-monitor-options-on-the-first-output.patch
-}
-
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Sunday, September 21, 2014 @ 21:21:05
Author: lcarlier
Revision: 222552
upgpkg: xf86-video-intel 2.99.916-2
fix FS#41944
Added:
xf86-video-intel/trunk/0001-sna-Use-default-monitor-options-on-the-first-output.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
+
0001-sna-Use-default-monitor-options-on-the-first-output.patch | 37
++
PKGBUILD | 15 +++-
2 files changed, 49 insertions(+), 3 deletions(-)
Added: 0001-sna-Use-default-monitor-options-on-the-first-output.patch
===
--- 0001-sna-Use-default-monitor-options-on-the-first-output.patch
(rev 0)
+++ 0001-sna-Use-default-monitor-options-on-the-first-output.patch
2014-09-21 19:21:05 UTC (rev 222552)
@@ -0,0 +1,37 @@
+From 1aefd16964c30264c05d136cef3e1e7de5eb9c53 Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Fri, 12 Sep 2014 07:46:43 +0100
+Subject: [PATCH] sna: Use default monitor options on the first output
+
+commit 6554cf0a69f04710b64f3488384fe5cb2748dc35
+Author: Chris Wilson
+Date: Mon Aug 11 12:22:17 2014 +0100
+
+sna: Parse output options early during initialisation
+
+rearranged the monitor query to before the num_outputs increment. The
+result was that it choose the second output as the default and not the
+intended first.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=522500
+Signed-off-by: Chris Wilson
+---
+ src/sna/sna_display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index f136c20..f6cfc80 100644
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -3751,7 +3751,7 @@ sna_output_add(struct sna *sna, unsigned id, unsigned
serial)
+ output->name = (char *)(output + 1);
+ memcpy(output->name, name, len + 1);
+
+- output->use_screen_monitor = config->num_output != 1;
++ output->use_screen_monitor = config->num_output != 0;
+ xf86OutputUseScreenMonitor(output, !output->use_screen_monitor);
+ assert(output->options);
+
+--
+2.1.0
+
Modified: PKGBUILD
===
--- PKGBUILD2014-09-21 18:58:28 UTC (rev 222551)
+++ PKGBUILD2014-09-21 19:21:05 UTC (rev 222552)
@@ -4,7 +4,7 @@
pkgname=xf86-video-intel
pkgver=2.99.916
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
license=('custom')
@@ -23,9 +23,18 @@
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=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+0001-sna-Use-default-monitor-options-on-the-first-output.patch)
+sha256sums=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01'
+'0195f5e5e69fc4b86d7ab51bc3d297e283cbdaec5c729702cca1b213809b4a18')
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Fix FS#41944 merged upstream
+ patch -Np1 -i
../0001-sna-Use-default-monitor-options-on-the-first-output.patch
+}
+
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Wednesday, August 6, 2014 @ 00:18:16
Author: lcarlier
Revision: 219345
upgpkg: xf86-video-intel 2.99.914-4
fix FS#41317
Added:
xf86-video-intel/trunk/sna-clear-cursor-image-after-rotation.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
-+
PKGBUILD| 11 +--
sna-clear-cursor-image-after-rotation.patch | 24
2 files changed, 33 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-05 22:14:19 UTC (rev 219344)
+++ PKGBUILD2014-08-05 22:18:16 UTC (rev 219345)
@@ -4,7 +4,7 @@
pkgname=xf86-video-intel
pkgver=2.99.914
-pkgrel=3
+pkgrel=4
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
license=('custom')
@@ -25,7 +25,8 @@
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)
+ sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
+sna-clear-cursor-image-after-rotation.patch)
sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae')
@@ -36,6 +37,8 @@
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
+ # fix FS#41317 - merged upstream
+ patch -Np1 -i ../sna-clear-cursor-image-after-rotation.patch
}
build() {
@@ -60,3 +63,7 @@
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
}
+sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
+'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
+'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae'
+'bc5383abd2dd680e830600da3d3da1d9c56b0b270efffd3aec94b23bfd9179c9')
Added: sna-clear-cursor-image-after-rotation.patch
===
--- sna-clear-cursor-image-after-rotation.patch (rev 0)
+++ sna-clear-cursor-image-after-rotation.patch 2014-08-05 22:18:16 UTC (rev
219345)
@@ -0,0 +1,24 @@
+From a88795c64123e4084044451d8861838ea904abd9 Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Tue, 29 Jul 2014 21:11:09 +0100
+Subject: sna: Clear cursor image after rotation
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81886
+Signed-off-by: Chris Wilson
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 8964e77..eed68d3 100644
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -4294,7 +4294,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna
*sna, xf86CrtcPtr crtc)
+ image = sna->cursor.scratch;
+ cursor->last_width = cursor->last_height = size;
+ }
+- if (width < cursor->last_width || height < cursor->last_height)
++ if (width < cursor->last_width || height < cursor->last_height ||
rotation != cursor->rotation)
+ memset(image, 0, 4*size*size);
+ if (rotation == RR_Rotate_0) {
+ if (argb == NULL) {
+--
+cgit v0.10.2
+
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Friday, August 1, 2014 @ 14:42:47
Author: lcarlier
Revision: 218489
upgpkg: xf86-video-intel 2.99.914-3
fix FS#40949
Added:
xf86-video-intel/trunk/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
+
PKGBUILD | 13 +--
sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch | 47 +++
2 files changed, 55 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-01 11:22:27 UTC (rev 218488)
+++ PKGBUILD2014-08-01 12:42:47 UTC (rev 218489)
@@ -4,7 +4,7 @@
pkgname=xf86-video-intel
pkgver=2.99.914
-pkgrel=2
+pkgrel=3
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
license=('custom')
@@ -24,15 +24,18 @@
'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)
+fix-i810-segfault-2.99.914.patch
+ sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
-'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041')
+'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
+'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae')
prepare() {
cd ${pkgname}-${pkgver}
- # fix segfaulting on i810 chipsets
+ # fix segfaulting on i810 chipsets - merged upstream
patch -Np1 -i ../fix-i810-segfault-2.99.914.patch
-# autoreconf -fiv
+ # fix FS#40949 - merged upstream
+ patch -Np1 -i ../sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
}
build() {
Added: sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
===
--- sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
(rev 0)
+++ sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch 2014-08-01
12:42:47 UTC (rev 218489)
@@ -0,0 +1,47 @@
+From fc2de62496061b9d0bace02729765344bd939122 Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+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
+Date: Mon Mar 24 10:46:57 2014 +
+
+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
+---
+ 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
+
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
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
===
--- PKGBUILD2014-07-31 15:35:34 UTC (rev 218456)
+++ PKGBUILD2014-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.patch2014-07-31 15:36:36 UTC (rev 218457)
@@ -0,0 +1,31 @@
+From ce804875914f52dba5356f8aefec850d411b051a Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Thu, 31 Jul 2014 15:18:02 +
+Subject: i810: Fix startup after marking GPU screens in the module
+
+Fixes regression from
+
+commit d6830190bc9956f485db6c3420f7a4a79793a693
+Author: Chris Wilson
+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
+---
+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
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Sunday, July 13, 2014 @ 14:01:10
Author: lcarlier
Revision: 216851
upgpkg: xf86-video-intel 2.99.912-2
fix FS#40863
Added:
xf86-video-intel/trunk/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
-+
0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch | 56
++
PKGBUILD| 15 ++
2 files changed, 68 insertions(+), 3 deletions(-)
Added: 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
===
--- 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
(rev 0)
+++ 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
2014-07-13 12:01:10 UTC (rev 216851)
@@ -0,0 +1,56 @@
+From e2bfa715a9e115921263d572b9f4c496b550a494 Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+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
+Date: Mon Jun 9 08:58:15 2014 +0100
+
+sna/dri2: Allow TearFree flipping to individual CRTC
+
+Signed-off-by: Chris Wilson
+---
+ 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
+
Modified: PKGBUILD
===
--- PKGBUILD2014-07-13 10:59:11 UTC (rev 216850)
+++ PKGBUILD2014-07-13 12:01:10 UTC (rev 216851)
@@ -4,7 +4,7 @@
pkgname=xf86-video-intel
pkgver=2.99.912
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
license=('custom')
@@ -23,9 +23,18 @@
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)
-sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501')
+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 \
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Tuesday, June 10, 2014 @ 11:04:10
Author: lcarlier
Revision: 214768
upgpkg: xf86-video-intel 2.99.912-1
upstream update 2.99.912
Modified:
xf86-video-intel/trunk/PKGBUILD
Deleted:
xf86-video-intel/trunk/sna-avoid-discarding-damage.patch
---+
PKGBUILD | 16 +
sna-avoid-discarding-damage.patch | 103
2 files changed, 4 insertions(+), 115 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-06-10 07:54:02 UTC (rev 214767)
+++ PKGBUILD2014-06-10 09:04:10 UTC (rev 214768)
@@ -3,8 +3,8 @@
# Maintainer: Jan de Groot
pkgname=xf86-video-intel
-pkgver=2.99.911
-pkgrel=2
+pkgver=2.99.912
+pkgrel=1
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
license=('custom')
@@ -23,17 +23,9 @@
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
-sna-avoid-discarding-damage.patch)
-sha256sums=('4e7a68491bcc4d49912c5ec3ee688badce3f929ce1b7618ede9d8001827270d6'
-'122637d66a70d40b098b0bb732000c8227ea1dd155af0c71f605f87934822dcb')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501')
-prepare() {
- cd ${pkgname}-${pkgver}
- # Fix FS#39747 (merged upstream)
- patch -Np1 -i ../sna-avoid-discarding-damage.patch
-}
-
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
Deleted: sna-avoid-discarding-damage.patch
===
--- sna-avoid-discarding-damage.patch 2014-06-10 07:54:02 UTC (rev 214767)
+++ sna-avoid-discarding-damage.patch 2014-06-10 09:04:10 UTC (rev 214768)
@@ -1,103 +0,0 @@
-From 3310ee89c1f1a663de5f5b12b8125809a213996f Mon Sep 17 00:00:00 2001
-From: Chris Wilson
-Date: Sat, 05 Apr 2014 11:18:31 +
-Subject: sna: Avoid discarding damage when applying WHOLE hint to pixmap
migration
-
-Once again, we must be careful when promoting from a region to whole
-pixmap migration that we do not discard required damage.
-
-Fixes regression from
-commit 27ac9f574f65cbd535751c925e9b2e2d7c8a6b3a [2.99.911]
-Author: Chris Wilson
-Date: Thu Feb 27 08:33:52 2014 +
-
-sna: Avoid promoting region-to-whole migration and discarding damage
-
-Reported-by: ged...@gmail.com
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77063
-Signed-off-by: Chris Wilson
-diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
-index 0116d54..71ba34d 100644
a/src/sna/sna_accel.c
-+++ b/src/sna/sna_accel.c
-@@ -2500,7 +2500,10 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
- flags |= MOVE_INPLACE_HINT;
- }
-
-- if (flags & MOVE_WHOLE_HINT && priv->gpu_damage == NULL)
-+ if ((flags & (MOVE_WHOLE_HINT | MOVE_READ)) == (MOVE_WHOLE_HINT |
MOVE_READ))
-+ return _sna_pixmap_move_to_cpu(pixmap, flags);
-+
-+ if (flags & MOVE_WHOLE_HINT && priv->gpu_damage == NULL &&
priv->cpu_damage == NULL)
- return _sna_pixmap_move_to_cpu(pixmap, flags);
-
- if (priv->gpu_damage == NULL &&
-@@ -2527,22 +2530,18 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
- return _sna_pixmap_move_to_cpu(pixmap, flags);
- }
-
-- if ((flags & MOVE_READ) == 0 &&
-- priv->gpu_damage &&
-- region_subsumes_damage(region, priv->gpu_damage)) {
-- DBG(("%s: region [(%d, %d), (%d, %d)] subsumes damage [(%d,%d),
(%d, %d)]\n",
-+ if (flags & MOVE_WHOLE_HINT) {
-+ DBG(("%s: region (%d, %d), (%d, %d) marked with WHOLE hint,
pixmap %dx%d\n",
- __FUNCTION__,
- region->extents.x1,
- region->extents.y1,
- region->extents.x2,
- region->extents.y2,
-- priv->gpu_damage->extents.x1,
-- priv->gpu_damage->extents.y1,
-- priv->gpu_damage->extents.x2,
-- priv->gpu_damage->extents.y2));
-+ pixmap->drawable.width,
-+ pixmap->drawable.height));
- if (dx | dy)
- RegionTranslate(region, -dx, -dy);
-- return _sna_pixmap_move_to_cpu(pixmap, flags);
-+ return _sna_pixmap_move_to_cpu(pixmap, flags | MOVE_READ);
- }
-
- if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, MOVE_READ)) {
-@@ -4471,17 +4470,19 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
- if (wedged(sna))
- return false;
-
-- DBG(("%s: bo? %d, can map? %d\n", __FUNCTION__,
-- priv-
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Saturday, April 5, 2014 @ 15:04:07
Author: lcarlier
Revision: 209827
upgpkg: xf86-video-intel 2.99.911-1
Fix corruption in firefox with SNA (FS#39747)
Added:
xf86-video-intel/trunk/sna-avoid-discarding-damage.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
---+
PKGBUILD | 12 +++-
sna-avoid-discarding-damage.patch | 103
2 files changed, 113 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-05 11:12:23 UTC (rev 209826)
+++ PKGBUILD2014-04-05 13:04:07 UTC (rev 209827)
@@ -23,9 +23,17 @@
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)
-sha256sums=('4e7a68491bcc4d49912c5ec3ee688badce3f929ce1b7618ede9d8001827270d6')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+sna-avoid-discarding-damage.patch)
+sha256sums=('4e7a68491bcc4d49912c5ec3ee688badce3f929ce1b7618ede9d8001827270d6'
+'122637d66a70d40b098b0bb732000c8227ea1dd155af0c71f605f87934822dcb')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # Fix FS#39747 (merged upstream)
+ patch -Np1 -i ../sna-avoid-discarding-damage.patch
+}
+
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
Added: sna-avoid-discarding-damage.patch
===
--- sna-avoid-discarding-damage.patch (rev 0)
+++ sna-avoid-discarding-damage.patch 2014-04-05 13:04:07 UTC (rev 209827)
@@ -0,0 +1,103 @@
+From 3310ee89c1f1a663de5f5b12b8125809a213996f Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Sat, 05 Apr 2014 11:18:31 +
+Subject: sna: Avoid discarding damage when applying WHOLE hint to pixmap
migration
+
+Once again, we must be careful when promoting from a region to whole
+pixmap migration that we do not discard required damage.
+
+Fixes regression from
+commit 27ac9f574f65cbd535751c925e9b2e2d7c8a6b3a [2.99.911]
+Author: Chris Wilson
+Date: Thu Feb 27 08:33:52 2014 +
+
+sna: Avoid promoting region-to-whole migration and discarding damage
+
+Reported-by: ged...@gmail.com
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77063
+Signed-off-by: Chris Wilson
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 0116d54..71ba34d 100644
+--- a/src/sna/sna_accel.c
b/src/sna/sna_accel.c
+@@ -2500,7 +2500,10 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ flags |= MOVE_INPLACE_HINT;
+ }
+
+- if (flags & MOVE_WHOLE_HINT && priv->gpu_damage == NULL)
++ if ((flags & (MOVE_WHOLE_HINT | MOVE_READ)) == (MOVE_WHOLE_HINT |
MOVE_READ))
++ return _sna_pixmap_move_to_cpu(pixmap, flags);
++
++ if (flags & MOVE_WHOLE_HINT && priv->gpu_damage == NULL &&
priv->cpu_damage == NULL)
+ return _sna_pixmap_move_to_cpu(pixmap, flags);
+
+ if (priv->gpu_damage == NULL &&
+@@ -2527,22 +2530,18 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ return _sna_pixmap_move_to_cpu(pixmap, flags);
+ }
+
+- if ((flags & MOVE_READ) == 0 &&
+- priv->gpu_damage &&
+- region_subsumes_damage(region, priv->gpu_damage)) {
+- DBG(("%s: region [(%d, %d), (%d, %d)] subsumes damage [(%d,%d),
(%d, %d)]\n",
++ if (flags & MOVE_WHOLE_HINT) {
++ DBG(("%s: region (%d, %d), (%d, %d) marked with WHOLE hint,
pixmap %dx%d\n",
+ __FUNCTION__,
+ region->extents.x1,
+ region->extents.y1,
+ region->extents.x2,
+ region->extents.y2,
+- priv->gpu_damage->extents.x1,
+- priv->gpu_damage->extents.y1,
+- priv->gpu_damage->extents.x2,
+- priv->gpu_damage->extents.y2));
++ pixmap->drawable.width,
++ pixmap->drawable.height));
+ if (dx | dy)
+ RegionTranslate(region, -dx, -dy);
+- return _sna_pixmap_move_to_cpu(pixmap, flags);
++ return _sna_pixmap_move_to_cpu(pixmap, flags | MOVE_READ);
+ }
+
+ if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, MOVE_READ)) {
+@@ -4471,17 +4470,19 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
+ if (wedged(sna))
+ return false;
+
+- DBG(("%s: bo? %d, can map? %d\n", __FUNCTION__,
+- priv->gpu_bo != NULL,
+- priv->gpu_bo ? kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo,
true) : 0));
+-
+ replaces = region->data == NULL &&
+ w >= pixmap->drawable.wi
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Saturday, December 28, 2013 @ 15:04:51
Author: andyrtr
Revision: 202838
upgpkg: xf86-video-intel 2.21.15-2
rebuild for new Xorg-server 1.15
Added:
xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
-+
PKGBUILD| 21 -
intel-2.21.15-xserver-1.15-compat.patch | 13 +
2 files changed, 25 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-12-28 13:56:01 UTC (rev 202837)
+++ PKGBUILD2013-12-28 14:04:51 UTC (rev 202838)
@@ -3,8 +3,8 @@
# Maintainer: Jan de Groot
pkgname=xf86-video-intel
-pkgver=2.99.904
-pkgrel=1
+pkgver=2.21.15
+pkgrel=2
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
license=('custom')
@@ -11,18 +11,21 @@
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=14' 'resourceproto'
'scrnsaverproto' 'libx11' 'libxrender')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'libx11'
'libxrender')
replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14'
'X-ABI-VIDEODRV_VERSION>=15'
+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)
-sha256sums=('ba480f523e3585c14eafa4efc058ebfee1e2ff35b2f62918e5f85ffc57e60179')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+intel-2.21.15-xserver-1.15-compat.patch)
+sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc'
+'fbf8fa35974dbf758b095c390d79f542b97993482ae3b63ec6542bffa87ba09f')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
+ cd ${pkgname}-${pkgver}
+ # fix build with Xorg 1.15
+ patch -Np1 -i ${srcdir}/intel-2.21.15-xserver-1.15-compat.patch
./configure --prefix=/usr \
--enable-dri \
--with-default-accel=sna
@@ -31,7 +34,7 @@
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
Added: intel-2.21.15-xserver-1.15-compat.patch
===
--- intel-2.21.15-xserver-1.15-compat.patch (rev 0)
+++ intel-2.21.15-xserver-1.15-compat.patch 2013-12-28 14:04:51 UTC (rev
202838)
@@ -0,0 +1,13 @@
+diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx
xf86-video-intel-2.21.15/src/compat-api.h
+--- xf86-video-intel-2.21.15/src/compat-api.h.jx 2013-05-21
06:15:11.0 -0400
xf86-video-intel-2.21.15/src/compat-api.h 2013-10-24 15:30:52.291337300
-0400
+@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr
+ if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y,
w, h)
+ #endif
+
++#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0)
++#define DamageUnregister(a, b) DamageUnregister(a)
++#endif
++
+ #endif
+
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Saturday, April 14, 2012 @ 05:15:17
Author: andyrtr
Revision: 156124
upgpkg: xf86-video-intel 2.18.0-2
add one upstream git fix for broken rendering with cairo 1.12
Added:
xf86-video-intel/trunk/Remove_broken_render_glyphs-to-dst.diff
Modified:
xf86-video-intel/trunk/PKGBUILD
-+
PKGBUILD| 10
Remove_broken_render_glyphs-to-dst.diff | 387 ++
2 files changed, 394 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-14 08:59:09 UTC (rev 156123)
+++ PKGBUILD2012-04-14 09:15:17 UTC (rev 156124)
@@ -3,7 +3,7 @@
pkgname=xf86-video-intel
pkgver=2.18.0
-pkgrel=1
+pkgrel=2
pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
@@ -13,11 +13,15 @@
conflicts=('xorg-server<1.11.99.903' 'xf86-video-i810'
'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('77fae98e73414140bf214dca5da32bcf079c4463')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+Remove_broken_render_glyphs-to-dst.diff)
+sha1sums=('77fae98e73414140bf214dca5da32bcf079c4463'
+ '80e02d9b9ebc5119ba8f03675b9ed0327a62f836')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # fix a rendering bug with recent cairo 1.12
+ patch -Np1 -i ${srcdir}/Remove_broken_render_glyphs-to-dst.diff
./configure --prefix=/usr --enable-dri
make
}
Added: Remove_broken_render_glyphs-to-dst.diff
===
--- Remove_broken_render_glyphs-to-dst.diff (rev 0)
+++ Remove_broken_render_glyphs-to-dst.diff 2012-04-14 09:15:17 UTC (rev
156124)
@@ -0,0 +1,387 @@
+From fde8a010b3d9406c2f65ee99978360a6ca54e006 Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Fri, 30 Mar 2012 11:47:21 +
+Subject: uxa: Remove broken render glyphs-to-dst
+
+Reported-by: Vincent Untz
+Reported-by: Robert Bradford
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48045
+Signed-off-by: Chris Wilson
+---
+diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
+index 6172f2f..b754f4e 100644
+--- a/uxa/uxa-glyphs.c
b/uxa/uxa-glyphs.c
+@@ -663,190 +663,6 @@ uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int
*out_x, int *out_y)
+ return cache->picture;
+ }
+
+-static int
+-uxa_glyphs_to_dst(CARD8 op,
+-PicturePtr pSrc,
+-PicturePtr pDst,
+-INT16 src_x, INT16 src_y,
+-INT16 xDst, INT16 yDst,
+-int nlist, GlyphListPtr list, GlyphPtr * glyphs,
+-BoxPtr extents)
+-{
+- ScreenPtr screen = pDst->pDrawable->pScreen;
+- uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+- PixmapPtr src_pixmap, dst_pixmap;
+- PicturePtr localSrc, glyph_atlas;
+- int x, y, n;
+- BoxRec box;
+-
+- if (uxa_screen->info->check_composite_texture &&
+- uxa_screen->info->check_composite_texture(screen, pSrc)) {
+- if (pSrc->pDrawable) {
+- int src_off_x, src_off_y;
+-
+- src_pixmap = uxa_get_offscreen_pixmap(pSrc->pDrawable,
&src_off_x, &src_off_y);
+- if (src_pixmap == NULL)
+- return -1;
+-
+- src_x += pSrc->pDrawable->x + src_off_x;
+- src_y += pSrc->pDrawable->y + src_off_y;
+- } else {
+- src_pixmap = NULL;
+- }
+- localSrc = pSrc;
+- } else {
+- int width, height;
+-
+- if (extents == NULL) {
+- uxa_glyph_extents(nlist, list, glyphs, &box);
+- extents = &box;
+- }
+-
+- width = extents->x2 - extents->x1;
+- height = extents->y2 - extents->y1;
+- if (width == 0 || height == 0)
+- return 0;
+-
+- if (pSrc->pDrawable) {
+- int src_off_x, src_off_y;
+-
+- src_off_x = extents->x1 - xDst;
+- src_off_y = extents->y1 - yDst;
+- localSrc = uxa_acquire_drawable(screen, pSrc,
+- src_x + src_off_x,
src_y + src_off_y,
+- width, height,
+- &src_x, &src_y);
+- if (uxa_screen->info->check_composite_texture &&
+- !uxa_screen->info->check_composite_texture(screen,
localSrc)) {
+- if (localSrc != pSrc)
+- FreePicture(localSrc, 0);
+-
[arch-commits] Commit in xf86-video-intel/trunk (2 files)
Date: Wednesday, May 26, 2010 @ 17:10:17
Author: jgc
Revision: 81155
Disable pageflipping, fixes rendering issues and crashes/hangs
Added:
xf86-video-intel/trunk/intel-2.11-no-pageflipping.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
--+
PKGBUILD |5 -
intel-2.11-no-pageflipping.patch | 33 +
2 files changed, 37 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-05-26 20:33:35 UTC (rev 81154)
+++ PKGBUILD2010-05-26 21:10:17 UTC (rev 81155)
@@ -3,7 +3,7 @@
pkgname=xf86-video-intel
pkgver=2.11.0
-pkgrel=1
+pkgrel=2
pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/";
@@ -14,12 +14,15 @@
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+intel-2.11-no-pageflipping.patch
LICENSE)
md5sums=('91a8baa97c4c8c85d35291fea547dd15'
+ 'dfc9f59fe048b412726c87fe3d45f4f5'
'b924480931774dec14515e270db4924d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/intel-2.11-no-pageflipping.patch" || return 1
./configure --prefix=/usr --enable-dri || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
Added: intel-2.11-no-pageflipping.patch
===
--- intel-2.11-no-pageflipping.patch(rev 0)
+++ intel-2.11-no-pageflipping.patch2010-05-26 21:10:17 UTC (rev 81155)
@@ -0,0 +1,33 @@
+diff -up xf86-video-intel-2.11.0/src/drmmode_display.c.no-flip
xf86-video-intel-2.11.0/src/drmmode_display.c
+--- xf86-video-intel-2.11.0/src/drmmode_display.c.no-flip 2010-05-03
15:30:19.0 -0400
xf86-video-intel-2.11.0/src/drmmode_display.c 2010-05-03
15:30:59.0 -0400
+@@ -1504,10 +1504,15 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn,
+ gp.value = &has_flipping;
+ (void)drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp,
+ sizeof(gp));
++
++xf86DrvMsg(scrn->scrnIndex, X_INFO,
++ "Pageflipping %s in kernel, %s disabled in X\n",
++ has_flipping ? "enabled" : "disabled",
++ has_flipping ? "but" : "and");
+ if (has_flipping) {
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
+- "Kernel page flipping support detected, enabling\n");
+- intel->use_pageflipping = TRUE;
++ "Don't panic: https://bugzilla.redhat.com/588421\n";);
++ intel->use_pageflipping = FALSE;
+ drmmode->flip_count = 0;
+ drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
+ drmmode->event_context.vblank_handler = drmmode_vblank_handler;
+diff -up xf86-video-intel-2.11.0/src/i830_dri.c.no-flip
xf86-video-intel-2.11.0/src/i830_dri.c
+--- xf86-video-intel-2.11.0/src/i830_dri.c.no-flip 2010-03-29
14:23:02.0 -0400
xf86-video-intel-2.11.0/src/i830_dri.c 2010-05-03 15:30:19.0
-0400
+@@ -1013,7 +1013,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen
+
+ info.CopyRegion = I830DRI2CopyRegion;
+ #if DRI2INFOREC_VERSION >= 4
+- if (intel->use_pageflipping) {
++ if (intel->use_pageflipping || 1) {
+ info.version = 4;
+ info.ScheduleSwap = I830DRI2ScheduleSwap;
+ info.GetMSC = I830DRI2GetMSC;
