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

[Chris Wilson]

 NEWS                  |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac          |    2 -
 src/sna/sna_display.c |    5 ----
 3 files changed, 57 insertions(+), 5 deletions(-)

New commits:
commit cb7b27a705b477ae1b369786eea13fb14506d54a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 2 09:36:13 2014 +0100

    2.99.912 snapshot

diff --git a/NEWS b/NEWS
index e209609..f49ea51 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,58 @@
+Snapshot 2.99.912 (2014-06-10)
+==============================
+A final round of features. We have everything from support for variable
+cursor sizes, support for the DRI3 and Present extensions, improved DRI2
+support, support for Xserver 1.16, userptr from kernel 3.16, and
+precursory support for DP multistream transport,
+
+ * Avoid discarding dirty pixels when promoting a migration to cover the
+   whole pixmap.
+   Regression in 2.99.911
+   https://bugs.freedesktop.org/show_bug.cgi?id=77063
+   https://bugs.freedesktop.org/show_bug.cgi?id=77178
+
+ * Avoid overextending degenerate lines (and consequentially accessing
+   pixels outside of our damaged area).
+   https://bugs.freedesktop.org/show_bug.cgi?id=77074
+
+ * Fix subpixel glyph rendering on gen2 devices (830-865 chipsets)
+   Regression in 2.99.911
+   https://bugs.freedesktop.org/show_bug.cgi?id=77201
+
+ * Share the global pixman glyph cache between ZaphodHeads
+   https://bugs.freedesktop.org/show_bug.cgi?id=54707
+
+ * Light up all connected outputs, even if their status is unknown, on
+   takeover from fbcon. This prevents loss of display after a resume
+   on recent kernels, for example.
+   https://bugs.freedesktop.org/show_bug.cgi?id=77768
+
+ * Show the video overlay (when supported by the hardware) across all
+   outputs.
+   https://bugs.freedesktop.org/show_bug.cgi?id=77802
+
+ * Do not discard damage when performing "BLT" spans inplace with the CPU.
+   Regression from 2.20.10
+
+ * Avoid discarding IO buffers too early during their preparation for a
+   new batch
+   https://bugs.freedesktop.org/show_bug.cgi?id=79238
+
+ * Fix fallback handling for displaying large scaled framebuffers (that
+   are too large to be scaled by the GPU in a single pass)
+   https://bugs.freedesktop.org/show_bug.cgi?id=79320
+
+ * Listen to external modifications of backlight value and propagate
+   the notifications to RandR clients. This should make the GUI report
+   ACPI keypresses to change the backlight correctly.
+   https://bugs.freedesktop.org/show_bug.cgi?id=79699
+
+ * UXA: fix pageflips with 3 heads.
+
+ * UXA: do not report a BadMatch error for DRI2GetMsc - as clients are
+   often unprepared and die when they get the unexpected error.
+
+
 Snapshot 2.99.911 (2014-03-19)
 ==============================
 Hans de Geode has been working on making the Xserver work without
diff --git a/configure.ac b/configure.ac
index fdadf4b..b3b6e8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.99.911],
+        [2.99.912],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit 52e2aa0939eee3566e4d6ee3a34f8acd93570530
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 10 08:49:41 2014 +0100

    sna: Queue a flip after fixing up a failed flip
    
    After a flip fails, we try to update the CRTC manually to new fb.
    However, the caller is still expecting to receive an event though the
    drm device to notify when the flips are complete. In order to maintain
    that ABI, we need to queue another flip after the fixup (to the
    currently bound fb).
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index eb47165..40cc347 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4494,7 +4494,7 @@ static int do_page_flip(struct sna *sna, struct kgem_bo *bo,
 			     bo->pitch, crtc->bo->pitch,
 			     crtc_offset, crtc->offset));
 fixup_flip:
-			if (sna_crtc_flip(sna, crtc)) {
+			if (crtc->bo != bo && sna_crtc_flip(sna, crtc)) {
 				assert(crtc->bo->active_scanout);
 				assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
 				crtc->bo->active_scanout--;
@@ -4502,9 +4502,6 @@ fixup_flip:
 
 				crtc->bo = kgem_bo_reference(bo);
 				crtc->bo->active_scanout++;
-
-				count++;
-				continue;
 			} else {
 				if (count && !xf86SetDesiredModes(sna->scrn)) {
 					xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,