xf86-video-intel: 3 commits - configure.ac NEWS src/sna/sna_dri.c test/dri2.c

[Chris Wilson]

 NEWS              |   37 +++++++++++++++++++++++++++++++++++++
 configure.ac      |    2 +-
 src/sna/sna_dri.c |    2 +-
 test/dri2.c       |    3 ---
 4 files changed, 39 insertions(+), 5 deletions(-)

New commits:
commit bb8484da487008df8b69beb8086167bc272e85bb
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jul 27 16:28:22 2013 +0100

    2.21.13 release

diff --git a/NEWS b/NEWS
index 8202e78..a207c4e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,40 @@
+Release 2.21.13 (2013-07-27)
+============================
+A minor release to repair the build for non-Linux systems, and to undo a
+few more regressions.
+
+ * Avoid potential memory corruption with allocations of very small
+   depth 1 bitmaps.
+
+ * Fix source clipping whilst computing copy extents and exposures.
+   [Regression from 2.21.12]
+   https://bugs.freedesktop.org/show_bug.cgi?id=66970
+
+ * Use /proc/cpuinfo if cpuid4 is not available (old hardware or old
+   gcc), and repair the build on systems without cpuid.
+   [Regression from 2.21.12]
+
+ * Fix performance regression on Ironlake from inadvertently flushing
+   after every operation.
+   [Regression from 2.21.11]
+   https://bugs.freedesktop.org/show_bug.cgi?id=67157
+
+ * Fix conflict handling when probing initial KMS configuration for
+   ZaphodHeads.
+   [Regression from 2.21.11]
+   https://bugs.freedesktop.org/show_bug.cgi?id=67176
+
+ * Stop being overly restrictive and rejecting stale DRI2 buffers.
+   (DRI2 is inherently racy in that the client may have completed and
+   submitted rendering to buffers that are now invalid on the server.
+   This race is magnified by bugs within the Xserver where it forgets
+   to notify the DRI2 clients of certain invalidation events.)
+   https://bugs.freedesktop.org/show_bug.cgi?id=67210
+
+ * Handle a failure to use a GTT mmap for a pixmap upload and try
+   an alternative method before giving up.
+
+
 Release 2.21.12 (2013-07-14)
 ============================
 In this release, we clear up the teething troubles from preserving the KMS
diff --git a/configure.ac b/configure.ac
index e1c749b..3987461 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.21.12],
+        [2.21.13],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit 95e172b365365e9189dd863f1033bc6ea036a713
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jul 28 12:25:16 2013 +0100

    sna/dri: correct DBG typo
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index a83cc05..b6a605b 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -804,7 +804,7 @@ __sna_dri_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
 				       pixmap, dst_bo, dx, dy,
 				       boxes, n, flags);
 
-		DBG(("%s: flushing? %d\n", __FUNCTION__, flush));
+		DBG(("%s: flushing? %d\n", __FUNCTION__, sync));
 		if (sync) { /* STAT! */
 			struct kgem_request *rq = sna->kgem.next_request;
 			kgem_submit(&sna->kgem);
commit c51cb32b6edbfc9b95cbb5e72a13ac42fdc745ed
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jul 27 16:28:45 2013 +0100

    test/dri2: We do not require the GLX includes
    
    Drop the GLX includes as they are not needed and obviously break if the
    GLX are not present on the system (and we fail to check during
    configure).
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/dri2.c b/test/dri2.c
index 0e2003c..5af4fdb 100644
--- a/test/dri2.c
+++ b/test/dri2.c
@@ -37,9 +37,6 @@
 #include <X11/extensions/extutil.h>
 #include <X11/extensions/dri2proto.h>
 
-#include <GL/glx.h>
-#include <GL/glxext.h>
-
 #include "dri2.h"
 
 /* Allow the build to work with an older versions of dri2proto.h and