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

[Chris Wilson]

 NEWS                |    3 ++-
 configure.ac        |    2 +-
 src/intel_display.c |   10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 7ff8b1ba543508f3b209f2ade7655c3aa34d546d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Oct 20 16:23:26 2012 +0100

    2.20.12 release
    
    How embarrassing! My fault for rushing :(
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/NEWS b/NEWS
index 08fb4a6..014921d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Release 2.20.11 (2012-10-20)
+Release 2.20.12 (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
@@ -20,6 +20,7 @@ SandyBridge+.
  * 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.11 contained a typo causing UXA to fail immediately.]
 
 Release 2.20.10 (2012-10-14)
 ============================
diff --git a/configure.ac b/configure.ac
index 449558f..8ddf40b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.20.11],
+        [2.20.12],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit 695b2ce2d32bde191080129b55f9bf8a9d48ee77
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Oct 20 16:19:21 2012 +0100

    uxa: Fixup drm_intel_bo_disable_reuse() typo
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_display.c b/src/intel_display.c
index ce1b9a8..f442da9 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -494,7 +494,7 @@ intel_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 			return FALSE;
 		}
 
-		drm_intel_gem_bo_disable_resuse(intel->front_buffer);
+		drm_intel_bo_disable_reuse(intel->front_buffer);
 	}
 
 	saved_mode = crtc->mode;
@@ -599,7 +599,7 @@ intel_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
 		return NULL;
 	}
 
-	drm_intel_gem_bo_disable_resuse(intel_crtc->rotate_bo);
+	drm_intel_bo_disable_reuse(intel_crtc->rotate_bo);
 
 	intel_crtc->rotate_pitch = rotate_pitch;
 	return intel_crtc->rotate_bo;
@@ -727,7 +727,7 @@ intel_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
 		ErrorF("have front buffer\n");
 	}
 
-	drm_intel_gem_bo_disable_resuse(bo);
+	drm_intel_bo_disable_reuse(bo);
 
 	intel_crtc->scanout_pixmap = ppix;
 	return drmModeAddFB(intel->drmSubFD, ppix->drawable.width,
@@ -1500,7 +1500,7 @@ intel_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
 	if (ret)
 		goto fail;
 
-	drm_intel_gem_bo_disable_resuse(intel->front_buffer);
+	drm_intel_bo_disable_reuse(intel->front_buffer);
 	intel->front_pitch = pitch;
 	intel->front_tiling = tiling;
 
@@ -1562,7 +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);
+	drm_intel_bo_disable_reuse(new_front);
 	intel_glamor_flush(intel);
 	intel_batch_submit(scrn);