xf86-video-intel: 2 commits - configure.ac NEWS src/sna/sna_accel.c

[Chris Wilson]

 NEWS                |   28 ++++++++++++++++++++++++++++
 configure.ac        |    2 +-
 src/sna/sna_accel.c |    6 ++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

New commits:
commit 81b35092c39bf6d9851ac37da4b20358405cf314
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 22 09:22:45 2013 +0100

    2.21.10 release

diff --git a/NEWS b/NEWS
index 2d358c0..0455c87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+Release 2.21.10 (2013-06-22)
+============================
+Fixes missing support for Xv (with the textured video adaptor) on
+Haswell, and an old bug with wide monitors on various generation. Along
+with a few other regression fixes and performance tweaks for various
+corner cases.
+
+ * Do not lose track of fast pageflips across mode changes
+   [regression from 2.20.8]
+
+ * Fix listing of Visuals for Xv
+   [regression from 2.21.8]
+   https://bugs.freedesktop.org/show_bug.cgi?id=65479
+
+ * Improve coherency of concurrent CPU accesses to a pixmap
+   https://bugs.freedesktop.org/show_bug.cgi?id=61628
+
+ * Set sampler swizzling for textured video on Haswell
+   https://bugs.freedesktop.org/show_bug.cgi?id=65699
+
+ * Apply scanout stride limits
+   https://bugs.freedesktop.org/show_bug.cgi?id=65099
+
+ * Undo the self-copy for cloned pixmaps for loimpress's animations
+   [regression from 2.21.7]
+   https://bugs.freedesktop.org/show_bug.cgi?id=65665
+
+
 Release 2.21.9 (2013-06-06)
 ===========================
 Consolidating the copy-on-write support, hopefully cleaning up the last of
diff --git a/configure.ac b/configure.ac
index 26688a3..6721279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.21.9],
+        [2.21.10],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit 5189ba727fe48990f00d5787c53d7b15fa1838a4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 22 13:39:47 2013 +0100

    sna: Refine the self-cow copy hack to reduce collateral damage
    
    Sergio Callegari found a case in LibreOffice that copied cloned pixmaps
    onto each other and then modified one of the pair. This was triggering
    the hack put in to speed up firefox scrolling, unfortunately.
    
    Reported-by: Sergio Callegari <sergio.callegari at gmail.com>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=65665
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 44b87cd..c8d4088 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4807,8 +4807,10 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 		hint |= IGNORE_CPU;
 
 	/* XXX hack for firefox -- subsequent uses of src will be corrupt! */
-	if (src_priv && src_priv->cow && src_priv->gpu_bo == dst_priv->gpu_bo) {
-		DBG(("%s: discarding cow reference for cousin copy\n",
+	if (src_priv &&
+	    COW(src_priv->cow) == COW(dst_priv->cow) &&
+	    IS_COW_OWNER(dst_priv->cow)) {
+		DBG(("%s: ignoring cow reference for cousin copy\n",
 		     __FUNCTION__));
 		assert(src_priv->cpu_damage == NULL);
 		bo = dst_priv->gpu_bo;