xf86-video-intel: 2 commits - src/intel_memory.c src/sna/sna_glyphs.c

[Chris Wilson]

 src/intel_memory.c   |    6 ++++--
 src/sna/sna_glyphs.c |   15 ++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 2f4de90709264ad19a3e3f5f0f79f4bba78a760a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Aug 12 13:01:24 2012 +0100

    uxa: Only emit a warning if we fail to tile the frontbuffer and the hw allows
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_memory.c b/src/intel_memory.c
index bb7710f..f08ebdd 100644
--- a/src/intel_memory.c
+++ b/src/intel_memory.c
@@ -264,10 +264,12 @@ retry:
 		return NULL;
 	}
 
-	if ((intel->tiling & INTEL_TILING_FB) && tiling_mode != I915_TILING_X) {
+	/* If we could have used tiling but failed, warn */
+	if (intel->tiling & INTEL_TILING_FB &&
+	    tiling_mode != I915_TILING_X &&
+	    intel_check_display_stride(scrn, pitch, I915_TILING_X))
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "Failed to set tiling on frontbuffer.\n");
-	}
 
 	xf86DrvMsg(scrn->scrnIndex, X_INFO,
 		   "Allocated new frame buffer %dx%d stride %ld, %s\n",
commit 4d3cafc99ab49da6744046bc2004981144cb064d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Aug 12 13:02:43 2012 +0100

    sna: Fix compilation without pixman glyphs
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 54ad510..db9af14 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -1298,15 +1298,11 @@ glyphs_fallback(CARD8 op,
 		int nlist, GlyphListPtr list, GlyphPtr *glyphs)
 {
 	struct sna *sna = to_sna_from_drawable(dst->pDrawable);
-	pixman_glyph_t stack_glyphs[N_STACK_GLYPHS];
-	pixman_glyph_t *pglyphs = stack_glyphs;
 	pixman_image_t *src_image, *dst_image;
-	pixman_glyph_cache_t *cache;
-	int dst_x = list->xOff, dst_y = list->yOff;
-	int src_dx, src_dy, dst_dx, dst_dy;
+	int src_dx, src_dy;
 	ScreenPtr screen = dst->pDrawable->pScreen;
 	RegionRec region;
-	int x, y, count, n;
+	int x, y, n;
 
 	glyph_extents(nlist, list, glyphs, &region.extents);
 	if (region.extents.x2 <= region.extents.x1 ||
@@ -1356,7 +1352,12 @@ glyphs_fallback(CARD8 op,
 
 #if HAS_PIXMAN_GLYPHS
 	if (sna->render.glyph_cache) {
-		cache = sna->render.glyph_cache;
+		pixman_glyph_t stack_glyphs[N_STACK_GLYPHS];
+		pixman_glyph_t *pglyphs = stack_glyphs;
+		pixman_glyph_cache_t *cache = sna->render.glyph_cache;
+		int dst_x = list->xOff, dst_y = list->yOff;
+		int dst_dx, dst_dy, count;
+
 		pixman_glyph_cache_freeze(cache);
 
 		count = 0;