fixed sna acceleration issue affecting gstreamer-0.10, upstream bug https://bugs.freedesktop.org/show_bug.cgi?id=77063 , fixes bug 506542

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 129 insertions, 4 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 7c9d2b9c3e77..dd403ce43628 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.159 2014/03/26 15:26:03 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.160 2014/05/14 16:41:08 axs Exp $
+
+*xf86-video-intel-2.99.911-r1 (14 May 2014)
+
+  14 May 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/xf86-video-intel-2.99.911-sna-pixmap-migration.patch,
+  +xf86-video-intel-2.99.911-r1.ebuild, -xf86-video-intel-2.99.911.ebuild:
+  fixed sna acceleration issue affecting gstreamer-0.10, upstream bug
+  https://bugs.freedesktop.org/show_bug.cgi?id=77063 , fixes bug 506542
 
 *xf86-video-intel-2.99.911 (26 Mar 2014)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index bf433f4a36a6..323ac25e90e0 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xf86-video-intel-2.21.15-handle-updates-to-DamageUnregister-API.patch 781 SHA256 e7b8369955f2ee3197215f1f5854618bb9ff96e9241e7fbd297fa55241c80bcc SHA512 b6455a848d31759f95fceecde9d682cdfc3943e299752f534dd3abcc526826e7031d71aa4316a21a5495e193b1351ff9838e9aeba3aaf6980513b54a28061a0c WHIRLPOOL dbc3b30cc6a283174078e671f2f767e06977a572e6a938d723d9bcc6573d2e691981d17e78f43292f0bdb1df65ad0f614503e42add3f9c67e132a0cac915a9a8
 AUX xf86-video-intel-2.99.905-fix-randr.patch 1528 SHA256 1d41609432b63f4cc0d461633fd2056182132f3fc911a75a909112413d0447d2 SHA512 5420dc03f859cb4f7524d9daad3087ac69c685ade01ebc7dc966c236cf4e920ffaa562ea12d354c8330073c03485ce4fe162130d3ff5201cfe02a1dd96dbcd94 WHIRLPOOL 4196658f48acf0ef2e0de464b199d9721c40280619ae317e23aa56ec351a6eae16b7192df520be4f83eb88984aee51289d1b0c6147d3b3ee227ee27eaaf4ca17
 AUX xf86-video-intel-2.99.906-server-crash.patch 1373 SHA256 4999e15222ae1ed67708ec27ea43ad2bd9646a2d02e35dc68d68b89392aa56cb SHA512 945cdaf69102c81b775c1b84ca62afbecbac6ce86ba966f921a27d37b29fb0195dcda6f190cbf549efdbf615c9ded8be715f42aa10d549c5e330afb756421eae WHIRLPOOL f5e2df2b5103c4c3c6400a33a6b3f63df87ec2e7a1ea36e9b226a8f95d2668a78ef0fd12b7f1493228cef6ce0ccda07589ba023d04fdb9aeb106c1dca7c83dea
 AUX xf86-video-intel-2.99.907-invalidation.patch 1707 SHA256 feb57fb5acbf18dec6d72e3990db318adecf07e44f7c7e03bdfaa488f6d40b66 SHA512 7ecbeb4574ad089f58aeeb84280bfca9f48754312a6d4f68d7f32c71e29de7582556806d5f399c555751edc9b70be5780a26ed2d2187fcfeba3fef4ed1f71229 WHIRLPOOL 093ac0b591c8c781b72325fe3762de475f3e97aaa54dbaaa207bcc55c0e66dca9e5e1ccf064cef1a847c98621438e8d633187ea4480c7ef76d05de853fcc6752
+AUX xf86-video-intel-2.99.911-sna-pixmap-migration.patch 3801 SHA256 c0758266c9eceb7647316639b4408c02e6beac86eef8871c5ff756c188488276 SHA512 b5d7ca5cd93d3ed4bba150b312fc868e53867a04df94956b367caf315e32398ea8558ee0059debd7e7684794fb2e55361d0ae425ccc66187d22297003894e76b WHIRLPOOL bc273ef3add88f9ddee4cbc9f23434edf0a91e5a6157691496c907dff2391dd8ce38ed98ca382c8b1f05c09dfb21b2dc12756b56d59026450dee61452d2dea0f
 DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc SHA512 988f231570cdd7e5c60880472c8bee765def040addf1fa6e5bc9e8a8722b5500d4ae2b798383dc90f2ca3df439e230c4df2d7e3f7cb50341d2d3d38486520292 WHIRLPOOL a19605d2473e72fc4e81a7a327a9b8e9534bdfceca64b44a3d0fd62bf031c9ec10c7d12379b9ca327bde8bc90e15c73cee7ef2de71de00c92bc70969f2a91d37
 DIST xf86-video-intel-2.20.13.tar.bz2 1649369 SHA256 0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3 SHA512 4f70ba1e794d26f8cbbb52c4936cfc8cdf4f43a353d9f921bf519a02a0c7f1b1eec6b3aa706ee6fc333a89b152416b9526f5d951ddea23ed70400e975c59febe WHIRLPOOL 101dff2402c75d0a48243ce1e3ac11e529f2d26a8d81321ae9ec528b6d35a3ed7647c342a2cf60389a69d677c29798c84e3252932b64f905966ef5af695cffbf
 DIST xf86-video-intel-2.21.15.tar.bz2 1977431 SHA256 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc SHA512 ca9680716445d0e9ba1a5d87433455f7a5f558802b4d214d79496426dbfd3e598968f784b531de024df30fefcc114d6e40cc9c6da94604beb48cd4430bf9e491 WHIRLPOOL 352b114b1030d1fbe2d33f028e7c03be8b4a6a4b0e4cb4fd7c890dd4cc5594ebf1fd6477c9319c1e2ff5033fc3276fb9caa8d91d1d3ba6b0c2f1734b60d3efed
@@ -23,6 +27,13 @@ EBUILD xf86-video-intel-2.99.906.ebuild 1583 SHA256 161a02fd7b59dbc77ef7179fbf49
 EBUILD xf86-video-intel-2.99.907-r1.ebuild 1583 SHA256 2e6e229050441249d6cb161da15a97444ecc47d0c37cb2f12da8b71bc739eeec SHA512 b8cdfa5fb74b7a6ddd2af4d1303d205d32d23e6800d79b0b210af6653c86a1e02097a7124567b7cf9536f4e6404cdb9235b0eb32600d1c8bab21abd63091fac8 WHIRLPOOL a4f4d68bd9e8ba96852f174f5bea5ff304d98e29bfb753859679c14722a034e7f694208e73c3725012b72c266d7f9aceaa908b614b25b39b0e55428f5e2b17ef
 EBUILD xf86-video-intel-2.99.909.ebuild 1563 SHA256 53127f0221102ee6da7f660480e2b1e2ea5b0bdc5d5bb0e2943d774d04e3207e SHA512 9074d7e88568d8fe988fedf79c12d7b1ab10e7bebaa5402fb6dae9b87f1b7eaa19a310721666378d571077455afb7703401fde1f015fbc97f626622c552a29c1 WHIRLPOOL a882db1c965a76d8aaa34da3204563e3eababb27b6a04b5845eacccc9299e7542a2c3320a1a7cf74ba19aeca20de90b4985e66af243110544c9a9b71d5748520
 EBUILD xf86-video-intel-2.99.910.ebuild 1563 SHA256 1a183e44b5272923c737c7bcec7fa43feb505e55a1293bf042f2c2d0e4239ded SHA512 c447d587fa1d77ffa192968c3c558a69b95a3702b5f18e53884996e0a247208587631d82dffcde37419d9f1ac704e9447c1306b7101243e736c37705bec2b7ed WHIRLPOOL 6963591213e49cc4edf49c7e24cbdd819cc1e4209e9317ddee575bc1d8adf8d7365a41244b7cb88df8eac6270d7e6a4610c820466c512b1fe902dce6fbcf85a0
-EBUILD xf86-video-intel-2.99.911.ebuild 1563 SHA256 2f454c36fe05466fbc6259235c8311f94550adee16806f439ebabcf47ec0cb46 SHA512 e981246934931e8faadb5b66d3dcdec1dacddee413c654492263fb5d0507e629c038cf9139b2daa6c3a5e92c01dc509054f4f7a16a6ae3989a35cea06c4d8d34 WHIRLPOOL a87462a6f0fce02efdf406702c07596cd716d78e36bc14b3e8a3d6fb0006a89f959e6fe66c484f7dd173525fc6929753babe2897ef7abe6cdb4dc2ea172e5bba
-MISC ChangeLog 59024 SHA256 a75d830e44679b90b5114ee8077c572756e69a0c2895bc61ba442b73ec4b4c35 SHA512 1b2fa07bd24e9f3b5836674cf09e0e83d4fcea970c80be235de543e55baffc3a0831e81d8cbf22b6a2e104fa62da252cbc9b9955eb55c78b7007447267fcfb89 WHIRLPOOL 71361fdb0ac8af7bbeef197aac93f33b7ee08e6d82e2d646b42b44b292be4c5551d0a625fb4d8a1b87bbf134ccc30388db0798e05f4101207eafad603c09fe9b
+EBUILD xf86-video-intel-2.99.911-r1.ebuild 1625 SHA256 715a4baa97aaf9c8930b8c49aaa96d62e50230d37ea63f7a22c7f2ff391c9975 SHA512 db0e91f618204233c70ac5bda1512900e25e149a5c9868fdc1e08cd21e9f6aad855164da155e254d18796c572cf3ad80329f1ff8eecd39ac603165078b9c72ff WHIRLPOOL 7c5159d39f7d33d3b6cb0b5c3072ca3d7cc8a04442f5f6775f26605ea20641789446e7d798374ed2620cc33a2c55eda3db737fa89dcb781384eac57e84539a53
+MISC ChangeLog 59406 SHA256 a82a65322264f8d6adbbfd3fc236d9c9421510930addc706821b325ca2b36f63 SHA512 9a2ce8f2d71f2d8bc7072cf7cfb3e3740f1f7003ab8e36b0a1c5504dbefcea9f059f601e2d6191c168c45fecfedae56b7c4c4ef4ca34a52ba24c5b47f141bf49 WHIRLPOOL 6b220b59e2a1046e346824190da32e0bfdb7eca165f1424e67cd998124e97bae80901430c0ef00930fd74f829d35bb1d30e71a028726b5e6456fbad17ded1fd1
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNznKkACgkQ2ugaI38ACPA/FAEAgIjpH53Xq92Niwn1jBEoagEU
+atVuSFOkHTDBYr1vbnYA/AplSpbb+9ZDPUEQniWZYtYIpc3VLWfSRTZYCqjRq4Zy
+=7wng
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.911-sna-pixmap-migration.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.911-sna-pixmap-migration.patch
new file mode 100644
index 000000000000..a69e0a213270
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.911-sna-pixmap-migration.patch
@@ -0,0 +1,102 @@
+From 3310ee89c1f1a663de5f5b12b8125809a213996f Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 05 Apr 2014 11:18:31 +0000
+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 <chris@chris-wilson.co.uk>
+Date:   Thu Feb 27 08:33:52 2014 +0000
+
+    sna: Avoid promoting region-to-whole migration and discarding damage
+
+Reported-by: gedgon@gmail.com
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77063
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+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.width &&
+ 		h >= pixmap->drawable.height;
+ 
++	DBG(("%s: bo? %d, can map? %d, replaces? %d\n", __FUNCTION__,
++	     priv->gpu_bo != NULL,
++	     priv->gpu_bo ? kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true) : 0,
++	     replaces));
++
+ 	if (priv->gpu_bo && (replaces || priv->gpu_bo->proxy)) {
+ 		DBG(("%s: discarding cached upload proxy\n", __FUNCTION__));
+ 		sna_pixmap_free_gpu(sna, priv);
++		replaces = true; /* Mark it all GPU damaged afterwards */
+ 	}
+ 	assert(priv->gpu_bo == NULL || priv->gpu_bo->proxy == NULL);
+ 
+@@ -4616,8 +4617,11 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
+ 		return true;
+ 
+ 	hint = MOVE_WRITE;
+-	if (w == pixmap->drawable.width && h*stride > 4096)
++	if (w == pixmap->drawable.width && (h+1)*stride > 65536) {
++		DBG(("%s: large upload (%d bytes), marking WHOLE_HINT\n",
++		     __FUNCTION__, h*stride));
+ 		hint |= MOVE_WHOLE_HINT;
++	}
+ 
+ 	if (!sna_drawable_move_region_to_cpu(&pixmap->drawable, region, hint))
+ 		return false;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.911.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.911-r1.ebuild
index 7d1713c011ea..4f892c66a6f9 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.911.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.911-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.911.ebuild,v 1.1 2014/03/26 15:26:03 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.911-r1.ebuild,v 1.1 2014/05/14 16:41:08 axs Exp $
 
 EAPI=5
 
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6
 	x11-proto/resourceproto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-sna-pixmap-migration.patch
+)
+
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable debug)