Fix issues with window decoration corruption on ivy bridge.

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

4 files changed, 149 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index e57ca1248811..0f40dcb37f77 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # 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.152 2014/01/02 22:51:51 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.153 2014/01/06 14:44:01 zx2c4 Exp $
+
+*xf86-video-intel-2.99.907-r1 (06 Jan 2014)
+
+  06 Jan 2014; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +files/xf86-video-intel-2.99.907-invalidation.patch,
+  +xf86-video-intel-2.99.907-r1.ebuild:
+  Fix issues with window decoration corruption on ivy bridge.
 
 *xf86-video-intel-2.99.907 (02 Jan 2014)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 12e5c598da35..f6559475869a 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xf86-video-intel-2.21.10-sna-clear-clear-hint.patch 943 SHA256 33465c66b0a4bca2dfd242c86cb8cb882fbf841e1c2da632a5aa76f9d04b84d1 SHA512 8de2268f3b8e7cf4af13b53836d45de237137ba925ff196803b873772fb7315a3d159941d66c95b8cce4d95a42933de55614fb123dbb00139761b4010e1432df WHIRLPOOL 5decb4a472144e4f5fc140730f0ce9727fbced1b5569d02cd2a3d47cbb0138628d888b2ff844a947db2ed134d5c439bb408c5084e324d309bd6f47e7b045f9ed
 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
 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.10.tar.bz2 1905905 SHA256 7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6 SHA512 f80317c4bfef80dc5e32274d1fe6fe643eb2fdb9bfb999b092a227b53bc6bc01bfc0f3e67156daae9d83543ef437f8ffc4a52c686517ba1314296d6bedf74305 WHIRLPOOL 2cf1eb9f7f1be24585de8162452acc8d2812d2ac6cfd375cd0063665f535f05d4c1f20a8593cdeb31e389e4918faa7e69ae220664c79fea2cb9324995e005e14
@@ -29,6 +33,24 @@ EBUILD xf86-video-intel-2.99.903.ebuild 1514 SHA256 2386e5c920bb6c1cf0ea7480457a
 EBUILD xf86-video-intel-2.99.905-r1.ebuild 1579 SHA256 ca918b63f0502075ba3843cb4f0d69907002c9e31ef20870ea87fbf69347124c SHA512 35273593482f566c4674436838a886a94aeb3dcc31e618b8868562b5a9f4279062bd51e79aef2bd86ab2ca847a38ecfaba7ae18e6b58ddb20f62fb4dc64d609a WHIRLPOOL b8d5530d80151d982cf2c4ec92e3b73dc234c46cca3da723f2cb2050fddd34e2721d24805c7f80be7169ae65c4ae4c1e30e8adf914962f12b1eacbbaa3131154
 EBUILD xf86-video-intel-2.99.905.ebuild 1527 SHA256 de8ae1a52eb9f9df36e102ae0c87b4278c656bbc6259ced2764366feb96f4f84 SHA512 f022aa8f0dd550a986e8e5dc87ad5826f7f49de93c26e4f5591e5ba2388f7a7257a6583d8543959d6ed085a18b5a792d8daae2535858bd08ad3ea371e90717ba WHIRLPOOL 345208f602c511bcf0baf354a639ab700f7578314218c3f5c5d11f66e6212fbc93ad1957dcc9406666e13961284a123202dc024d837e4a1b7039fb36b19f516f
 EBUILD xf86-video-intel-2.99.906.ebuild 1583 SHA256 161a02fd7b59dbc77ef7179fbf492436356bf3780cfb49d5d1a1e858e9f90caa SHA512 06b12b5a20d554c587b3e1a1eaa2d5b998303a34ff327e93ccf3ce51b2768469341492aaa09c77b33ab69488b40158fc6ae7dbaca904579f5dab33e63076c79c WHIRLPOOL 6370e72f3ecf15b7e6057f568cdf2d063135eaacf15ef1f7b3e501343d1ffe737062c4e18da67c51e73e54bc34369d854b8d8037d9a9aedfc922954efe528102
+EBUILD xf86-video-intel-2.99.907-r1.ebuild 1583 SHA256 2e6e229050441249d6cb161da15a97444ecc47d0c37cb2f12da8b71bc739eeec SHA512 b8cdfa5fb74b7a6ddd2af4d1303d205d32d23e6800d79b0b210af6653c86a1e02097a7124567b7cf9536f4e6404cdb9235b0eb32600d1c8bab21abd63091fac8 WHIRLPOOL a4f4d68bd9e8ba96852f174f5bea5ff304d98e29bfb753859679c14722a034e7f694208e73c3725012b72c266d7f9aceaa908b614b25b39b0e55428f5e2b17ef
 EBUILD xf86-video-intel-2.99.907.ebuild 1527 SHA256 20f1fe957d7add7fe4c30e33d6a38e88a116b9d8a3d1c82512b549c1e9807fb4 SHA512 815318c122154617e1c3461a32ff03380faef4431c349e526337a99d3f722f7fdb5971e80d14d68e584d2630c8b3ce24ca4fed04c306a87df776fc541f1773c8 WHIRLPOOL f08eaa02839d58b0a8f77059d7cf0ae72b4f8c0411e17453f4b78be0c954a5864f8ae273c57a5bcecd6235a69cf36617a781dfc31e328281fafa3ad373687413
-MISC ChangeLog 57542 SHA256 d9e50caf9e9b52b9d96ad9da56431d85c2fb2e6d8b57803cf76c0191f1b45d26 SHA512 58221190be3d6deaa0f4eb397acc6b3c6da8dff6b9054a8dd5c7a49c50b44c19be54d71812020b5829a6c908e1b0d85f642d06cafac654262814c20a40ac5095 WHIRLPOOL 9b6aae69ab0eaa839b43a8437e5c4ccd9711164077595b8542cf92509c372172121a1a6278379a175ca290d223cbb7400c0934f754a150d14cc92d9a3654bcf3
+MISC ChangeLog 57799 SHA256 0b77c36ce1c3c89893d2c22e621052f05a52bbee12e22972d86240cff0bcc408 SHA512 aa671b22955aa1b96d77a5a28c0206505bfedeb6531c449240d6382ec6a9517ea043715f17544424550de70418e202290c01f3990f00f1768362c2287a4ca489 WHIRLPOOL 7844a902f89e8890cb71bc6968124603d5a54cbc5a7e60ef8dda944b9baa4561980fd6ab5e7b4fc2573827077a33385ff4bb0c44dbb8fb7c0e44877672aa87a3
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSysExAAoJEEn8cBKl3gOuo+IQANYAXp7ZTRmt4xb3Wy5kfluZ
+Y+Mp+hdQtKnSxhepkfiaDRCX/Gk8B0OEbtI5T8LVXQcmsDrfOy2u0FG7sti+WjUZ
+w/NjmSOmJZJ76mVVLvcIjr9Z6mS11WumQZaH/JbKndJAjphORgpuvbCxG1VML0AR
+oBWzwd9bq+xXkm46t27RfLMVW9MxGqnPlzSPiu/T6BaRNCBj/l2IJG6HJtXsBpvE
+faeHCrVn7ICqeQ/URcu7lewq9PY6ukjoz5Ead/ZoeiY66FJav1iq3F+76z51DhIq
+2kZeUaectKD2avor0eQFxK+zZlcdCsI9fGZDC9sJpbz7jEubxWjY7ylp/8SDxvRJ
+/j9L/9IeBq1fwur9UqODth3c9LfEosoWh21ZL3a3K8kz9FjKH778bEDjhuwMN1/F
+UL+ktzffsXj4yNdjIBzqgpRpmoeBnUXOOsOtPU/6lGMrrFDxPKFWSgZtY2DpHlzy
+36ioOlJGs6PSuARNqAHL7jEgFoM0vRwpN8OY1ENRFXCIbkNIg1ZqkISw/HrBamgl
+MXUgt6SOYYNKYQPntZ0AN7UVI20HWLrjvrRB87EP/HhptLTlT63Kt3M/L59TrSOF
+Z4/H8tLguCkNE+FsRQRlao7p1ll3CNPAuoBkkFNaefenuVhpmj86F5T3uGv6LmJ6
+uF0mZPpc51YUBJscWoZO
+=WKT5
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.907-invalidation.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.907-invalidation.patch
new file mode 100644
index 000000000000..e78d5bf336b0
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.907-invalidation.patch
@@ -0,0 +1,46 @@
+From 4d8f78bc95f8dd36693f74365dbc3c442fbbf8a9 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 02 Jan 2014 15:01:38 +0000
+Subject: sna/gen7+: Emit invalidate between operations if rendering to source/mask
+
+Fixes regression from
+commit c79cb18407273dc7798618390bd0b7d69b0f80d6 [2.99.907]
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Wed Nov 20 11:17:20 2013 +0000
+
+    sna/gen7: Try to reduce flushes between primitive continuations
+
+Reported-by: Simon Munton <simon.j.munton@gmail.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73208
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
+index 572e3e3..e45555b 100644
+--- a/src/sna/gen7_render.c
++++ b/src/sna/gen7_render.c
+@@ -1114,8 +1114,7 @@ gen7_emit_state(struct sna *sna,
+ 
+ 	need_stall = sna->render_state.gen7.surface_table != wm_binding_table;
+ 
+-	need_invalidate = need_stall &&
+-		(kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo));
++	need_invalidate = kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo);
+ 	if (ALWAYS_INVALIDATE)
+ 		need_invalidate = true;
+ 
+diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
+index a8b4ea8..309398d 100644
+--- a/src/sna/gen8_render.c
++++ b/src/sna/gen8_render.c
+@@ -1130,8 +1130,7 @@ gen8_emit_state(struct sna *sna,
+ 
+ 	need_stall = sna->render_state.gen8.surface_table != wm_binding_table;
+ 
+-	need_invalidate = need_stall &&
+-		(kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo));
++	need_invalidate = kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo);
+ 	if (ALWAYS_INVALIDATE)
+ 		need_invalidate = true;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.907-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.907-r1.ebuild
new file mode 100644
index 000000000000..dbc01261e72a
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.907-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.907-r1.ebuild,v 1.1 2014/01/06 14:44:01 zx2c4 Exp $
+
+EAPI=5
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
+IUSE="glamor +sna +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+	glamor? ( uxa )
+"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	glamor? (
+		x11-libs/glamor
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/resourceproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-invalidation.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		$(use_enable glamor)
+		$(use_enable sna)
+		$(use_enable uxa)
+		$(use_enable udev)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}