xf86-video-intel: 2 commits - src/sna/sna_accel.c src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_accel.c   |    5 ++++-
 src/sna/sna_display.c |    8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 186ac909ad2099f834e7b2c513a02cd4d041327c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 20 15:32:30 2013 +0100

    sna: Fix tiled scanout limits for Valleyview
    
    It appears that Valleyview shares the same scanout limits as gen4.
    
    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 cd3d695..a9cec12 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1153,7 +1153,9 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)
 	}
 
 	bo = sna_pixmap_get_bo(sna->front);
-	if ((sna->kgem.gen >> 3) > 4)
+	if (sna->kgem.gen == 071)
+		pitch_limit = bo->tiling ? 16 * 1024 : 32 * 1024;
+	else if ((sna->kgem.gen >> 3) > 4)
 		pitch_limit = 32 * 1024;
 	else if ((sna->kgem.gen >> 3) == 4)
 		pitch_limit = bo->tiling ? 16 * 1024 : 32 * 1024;
@@ -1230,7 +1232,9 @@ static struct kgem_bo *sna_crtc_attach(xf86CrtcPtr crtc)
 		     __FUNCTION__, crtc->mode.HDisplay, crtc->mode.VDisplay));
 
 		tiling = I915_TILING_X;
-		if ((sna->kgem.gen >> 3) > 4)
+		if (sna->kgem.gen == 071)
+			tiled_limit = 16 * 1024 * 8;
+		else if ((sna->kgem.gen >> 3) > 4)
 			tiled_limit = 32 * 1024 * 8;
 		else if ((sna->kgem.gen >> 3) == 4)
 			tiled_limit = 16 * 1024 * 8;
commit 112fc5f370f8daf267d7241ca2d669194abaa183
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 19 19:53:14 2013 +0100

    sna: Tidy a redundant conditional for CopyArea
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 0f5c392..9cbecfe 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4325,6 +4325,9 @@ move_to_gpu(PixmapPtr pixmap, struct sna_pixmap *priv,
 	}
 
 	if (priv->gpu_bo) {
+		if (priv->cpu_damage == NULL)
+			return true;
+
 		if (alu != GXcopy)
 			return true;
 
@@ -4763,7 +4766,7 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 			if (replaces)
 				kgem_bo_undo(&sna->kgem, bo);
 
-			if (replaces && alu == GXcopy &&
+			if (replaces &&
 			    src_pixmap->drawable.width == dst_pixmap->drawable.width &&
 			    src_pixmap->drawable.height == dst_pixmap->drawable.height) {
 				assert(src_pixmap->drawable.depth == dst_pixmap->drawable.depth);