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

[Chris Wilson]

 NEWS                        |   62 +++++++++++++++++++++++++++++++++++++++++++-
 configure.ac                |    2 -
 src/sna/sna_video_overlay.c |   23 ++++++++++++++--
 3 files changed, 82 insertions(+), 5 deletions(-)

New commits:
commit b42d81b63f5b6a571faffaadd42c74adce40128a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Oct 14 09:15:38 2012 +0100

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

diff --git a/NEWS b/NEWS
index 2cc2353..be10700 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,63 @@
+Release 2.20.10 (2012-10-14)
+============================
+The last couple of weeks have been fairly retrospective, a dive into
+prehistory tidying up the earlier generations which lay languishing as
+the core progressed and lead to a number of annoying core bugs being
+fixed.
+
+ * Release DRM master earlier during shutdown so switching between
+   multiple X servers works automatically.
+   https://bugs.freedesktop.org/show_bug.cgi?id=55446
+
+ * Suppress error propagation from DRI2GetMSC and behave as if the pipe
+   was simply off to avoid unexpected errors in the clients
+   https://bugs.freedesktop.org/show_bug.cgi?id=55395
+
+ * A few fixes to i8xx batch emission, ensuring that the GPU is always
+   in a valid state.
+   https://bugs.freedesktop.org/show_bug.cgi?id=55455
+
+ * Prevent a use-after-free during UXA shutdown due to inspecting
+   the glamor flags after the glamor interface had been freed.
+
+ * Prevent a crash combining TearFree and rotations.
+   https://bugs.freedesktop.org/show_bug.cgi?id=55527
+
+ * Correct a missing damage upload along PutImage after using the CPU bo
+   as a source for the GPU.
+   https://bugs.freedesktop.org/show_bug.cgi?id=55508
+
+ * Fix compilation for older glibc without O_CLOEXEC
+   https://bugs.freedesktop.org/show_bug.cgi?id=55577
+
+ * Fix out-of-tree builds failing to recompile the gen4 assemblies
+   https://bugs.freedesktop.org/show_bug.cgi?id=55645
+
+ * Fix non-standard build host configuration handling for intel-gen4asm
+   https://bugs.freedesktop.org/show_bug.cgi?id=55646
+
+ * Fix a potential batch buffer overflow when replacing the last BLT fill
+   operation with a copy
+   https://bugs.freedesktop.org/show_bug.cgi?id=55700
+
+ * Flush the render pipeline more frequently on Ironlake as not all
+   pipelined state changes are.
+   https://bugs.freedesktop.org/show_bug.cgi?id=51422
+
+ * Detect when we need to read the destination for the background raster
+   op during fallbacks.
+   https://bugs.freedesktop.org/show_bug.cgi?id=55810
+
+ * Avoid a potential deference of an invalid CPU mmap after doing an
+   inplace tiled upload.
+   https://bugs.freedesktop.org/show_bug.cgi?id=55812
+
+ * Prevent sign extension when packing the upload data for CopyPlane
+   https://bugs.freedesktop.org/show_bug.cgi?id=55823
+
+ * Fix some render corruption with a UDL slave output and pageflipping
+
+
 Release 2.20.9 (2012-09-29)
 ===========================
 And so it came to pass that a critical bug was uncovered in UXA. The
@@ -13,7 +73,7 @@ the issue.
 
 In other news:
 
-  * Prepare for xorg-1.4, the api is being tweaked again.
+  * Prepare for xorg-1.14, the api is being tweaked again.
 
   * Handle early FreeScreen in UXA.
     https://bugs.freedesktop.org/show_bug.cgi?id=55346
diff --git a/configure.ac b/configure.ac
index 79bba83..972d918 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.20.9],
+        [2.20.10],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit 877e9c57c788cb3d4db1e96e519b26ca5d542465
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 12 17:57:28 2012 +0100

    sna/overlay: Trim suggested BestSize to fit within the overlay constraints
    
    As the maximum reported image sizes are for the source image, we should
    be careful not to recommend the application use an output Window larger
    than can be handled by the overlay hardware. So shrink it to fit, whilst
    preserving the aspect ratio.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index babdfc6..b73e9dd 100644
--- a/src/sna/sna_video_overlay.c
+++ b/src/sna/sna_video_overlay.c
@@ -285,12 +285,29 @@ sna_video_overlay_query_best_size(ScrnInfoPtr scrn,
 				  Bool motion,
 				  short vid_w, short vid_h,
 				  short drw_w, short drw_h,
-				  unsigned int *p_w, unsigned int *p_h, pointer data)
+				  unsigned int *p_w, unsigned int *p_h,
+				  pointer data)
 {
-	if (vid_w > (drw_w << 1))
+	struct sna *sna = to_sna(scrn);
+	short max_w, max_h;
+
+	if (vid_w > (drw_w << 1) || vid_h > (drw_h << 1)){
 		drw_w = vid_w >> 1;
-	if (vid_h > (drw_h << 1))
 		drw_h = vid_h >> 1;
+	}
+
+	if (sna->kgem.gen < 21) {
+		max_w = IMAGE_MAX_WIDTH_LEGACY;
+		max_h = IMAGE_MAX_HEIGHT_LEGACY;
+	} else {
+		max_w = IMAGE_MAX_WIDTH;
+		max_h = IMAGE_MAX_HEIGHT;
+	}
+
+	while (drw_w > max_w || drw_h > max_h) {
+		drw_w >>= 1;
+		drw_h >>= 1;
+	}
 
 	*p_w = drw_w;
 	*p_h = drw_h;