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

[Chris Wilson]

 NEWS           |   22 ++++++++++++++++++++++
 configure.ac   |    2 +-
 src/sna/kgem.c |   24 ++++++++++++++++--------
 3 files changed, 39 insertions(+), 9 deletions(-)

New commits:
commit 2770655371954413c750b030c9a7135baee302d4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 6 12:04:23 2013 +0100

    2.21.9 release

diff --git a/NEWS b/NEWS
index eb0d9b2..2d358c0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+Release 2.21.9 (2013-06-06)
+===========================
+Consolidating the copy-on-write support, hopefully cleaning up the last of
+the regressions.
+
+ * Restore vsync on textured videos.
+   [regression from 2.21.8]
+   https://bugs.freedesktop.org/show_bug.cgi?id=65048
+
+ * Fix incorrect ordering of possible_clones with certain outputs, which
+   can lead to attempting to incorrectly clone 2 outputs and failing to
+   light them up.
+   [regression from 2.20.10]
+
+ * Fix performance regression from not promoting large fills to the GPU
+   [regression from 2.21.7]
+
+ * Undo the pixmap clone before performing a DRI2CopyRegion
+   [regression from 2.21.7]
+   https://bugs.freedesktop.org/show_bug.cgi?id=65250
+
+
 Release 2.21.8 (2013-05-27)
 ===========================
 A quick release to cleanup a few regressions from the introduction of
diff --git a/configure.ac b/configure.ac
index 0bac6f6..3f6f9bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.21.8],
+        [2.21.9],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit d3345cd269dc75999b35f3286d21059974dcb24b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 6 12:18:32 2013 +0100

    sna: Only emit an error for terminal mmap failures
    
    If we repeat the mmap, keep quiet. Only emit the ErrorF in case even the
    repeated attempts to mmap the bo fail.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 62713de..fefaa8b 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -292,8 +292,8 @@ retry_gtt:
 	VG_CLEAR(mmap_arg);
 	mmap_arg.handle = bo->handle;
 	if (drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg)) {
-		ErrorF("%s: failed to retrieve GTT offset for handle=%d: %d\n",
-		       __FUNCTION__, bo->handle, errno);
+		int err = errno;
+
 		(void)__kgem_throttle_retire(kgem, 0);
 		if (kgem_expire_cache(kgem))
 			goto retry_gtt;
@@ -303,6 +303,8 @@ retry_gtt:
 			goto retry_gtt;
 		}
 
+		ErrorF("%s: failed to retrieve GTT offset for handle=%d: %d\n",
+		       __FUNCTION__, bo->handle, err);
 		return NULL;
 	}
 
@@ -310,8 +312,8 @@ retry_mmap:
 	ptr = mmap(0, bytes(bo), PROT_READ | PROT_WRITE, MAP_SHARED,
 		   kgem->fd, mmap_arg.offset);
 	if (ptr == MAP_FAILED) {
-		ErrorF("%s: failed to mmap %d, %d bytes, into GTT domain: %d\n",
-		       __FUNCTION__, bo->handle, bytes(bo), errno);
+		int err = errno;
+
 		if (__kgem_throttle_retire(kgem, 0))
 			goto retry_mmap;
 
@@ -320,6 +322,8 @@ retry_mmap:
 			goto retry_mmap;
 		}
 
+		ErrorF("%s: failed to mmap handle=%d, %d bytes, into GTT domain: %d\n",
+		       __FUNCTION__, bo->handle, bytes(bo), err);
 		ptr = NULL;
 	}
 
@@ -4694,8 +4698,8 @@ retry:
 	mmap_arg.offset = 0;
 	mmap_arg.size = bytes(bo);
 	if (drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg)) {
-		ErrorF("%s: failed to mmap %d, %d bytes, into CPU domain: %d\n",
-		       __FUNCTION__, bo->handle, bytes(bo), errno);
+		int err = errno;
+
 		if (__kgem_throttle_retire(kgem, 0))
 			goto retry;
 
@@ -4704,6 +4708,8 @@ retry:
 			goto retry;
 		}
 
+		ErrorF("%s: failed to mmap handle=%d, %d bytes, into CPU domain: %d\n",
+		       __FUNCTION__, bo->handle, bytes(bo), err);
 		return NULL;
 	}
 
@@ -4734,8 +4740,8 @@ retry:
 	mmap_arg.offset = 0;
 	mmap_arg.size = bytes(bo);
 	if (drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg)) {
-		ErrorF("%s: failed to mmap %d, %d bytes, into CPU domain: %d\n",
-		       __FUNCTION__, bo->handle, bytes(bo), errno);
+		int err = errno;
+
 		if (__kgem_throttle_retire(kgem, 0))
 			goto retry;
 
@@ -4744,6 +4750,8 @@ retry:
 			goto retry;
 		}
 
+		ErrorF("%s: failed to mmap handle=%d, %d bytes, into CPU domain: %d\n",
+		       __FUNCTION__, bo->handle, bytes(bo), err);
 		return NULL;
 	}