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

[Chris Wilson]

 NEWS                |   23 +++++++++++++++++++++++
 configure.ac        |    2 +-
 src/intel_display.c |    8 ++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 2083e253b3d1ecc218ab1e523e4026ddd4561112
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Oct 20 16:07:11 2012 +0100

    2.20.11 release
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/NEWS b/NEWS
index be10700..08fb4a6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+Release 2.20.11 (2012-10-20)
+============================
+More bug reports, more bug fixes! Perhaps the headline feature is
+that with a secure batches, coming to a 3.8 kernel near you, we may
+finally have the ability to perform updates to the scanout synchronized
+to the refresh rate on later SandyBridge and IvyBridge chipsets. It comes
+at quite a power cost as we need to keep the GPU out of its power saving
+modes, but it should allow legacy vsync to function at last. But this
+should allow us to address a longstanding issue with tearing on
+SandyBridge+.
+
+ * Fix component-alpha rendering on IvyBridge, for example subpixel
+   antialiased glyphs.
+   https://bugs.freedesktop.org/show_bug.cgi?id=56037
+
+ * Flush before some "pipelined" state changes on gen4. The evidence is
+   that the same flushes as required on gen5+ are also required for gen4.
+   https://bugs.freedesktop.org/show_bug.cgi?id=55627
+
+ * Prevent a potential crash when forcing a stall on a busy CPU bo
+   https://bugs.freedesktop.org/show_bug.cgi?id=56180
+
+
 Release 2.20.10 (2012-10-14)
 ============================
 The last couple of weeks have been fairly retrospective, a dive into
diff --git a/configure.ac b/configure.ac
index 972d918..449558f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.20.10],
+        [2.20.11],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit fc0ba65f5efe217f2ab5e920255d2133d7c9e5e8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Oct 20 09:29:10 2012 +0100

    uxa: Disable bo reuse after binding to a scanout
    
    On gen6+, bo are expected to be LLC by default. However, as using the bo
    for the scanout causes it to be moved into the uncached domain, this
    assumption is then false and we should release the bo back to the system
    rather than spread the uncached buffers around. The most common
    allocator of scanouts is for pageflipping which are already non-reusable
    due to the DRI2 export, so there should actually be little impact.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_display.c b/src/intel_display.c
index d58e6e0..ce1b9a8 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -493,6 +493,8 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 			ErrorF("failed to add fb\n");
 			return FALSE;
 		}
+
+		drm_intel_gem_bo_disable_resuse(intel->front_buffer);
 	}
 
 	saved_mode = crtc->mode;
@@ -597,6 +599,8 @@ intel_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
 		return NULL;
 	}
 
+	drm_intel_gem_bo_disable_resuse(intel_crtc->rotate_bo);
+
 	intel_crtc->rotate_pitch = rotate_pitch;
 	return intel_crtc->rotate_bo;
 }
@@ -723,6 +727,8 @@ intel_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
 		ErrorF("have front buffer\n");
 	}
 
+	drm_intel_gem_bo_disable_resuse(bo);
+
 	intel_crtc->scanout_pixmap = ppix;
 	return drmModeAddFB(intel->drmSubFD, ppix->drawable.width,
 			   ppix->drawable.height, ppix->drawable.depth,
@@ -1494,6 +1500,7 @@ intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 	if (ret)
 		goto fail;
 
+	drm_intel_gem_bo_disable_resuse(intel->front_buffer);
 	intel->front_pitch = pitch;
 	intel->front_tiling = tiling;
 
@@ -1555,6 +1562,7 @@ intel_do_pageflip(intel_screen_private *intel,
 			 new_front->handle, &new_fb_id))
 		goto error_out;
 
+	drm_intel_gem_bo_disable_resuse(new_front);
 	intel_glamor_flush(intel);
 	intel_batch_submit(scrn);