xf86-video-intel: 2 commits - src/sna/sna_threads.c src/sna/sna_trapezoids_boxes.c

[Chris Wilson]

 src/sna/sna_threads.c          |    3 +++
 src/sna/sna_trapezoids_boxes.c |   22 +++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 04ddea075e9e07cf3158594130d5ba7d1f50f7f1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jul 4 12:14:11 2014 +0100

    sna: Do a quirk early check for short areas before threading
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_threads.c b/src/sna/sna_threads.c
index f263d24..e2bb804 100644
--- a/src/sna/sna_threads.c
+++ b/src/sna/sna_threads.c
@@ -259,6 +259,9 @@ int sna_use_threads(int width, int height, int threshold)
 	if (max_threads <= 0)
 		return 1;
 
+	if (height <= num_threads)
+		return height;
+
 	if (width < 128)
 		height /= 128/width;
 
commit 228a22fe8db044a18556a9fdb989323274817771
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jul 4 12:10:10 2014 +0100

    sna: Disable use of threaded compositor when using threaded renderer
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_trapezoids_boxes.c b/src/sna/sna_trapezoids_boxes.c
index 1cfad29..2f7028f 100644
--- a/src/sna/sna_trapezoids_boxes.c
+++ b/src/sna/sna_trapezoids_boxes.c
@@ -682,7 +682,7 @@ pixsolid_opacity(struct pixman_inplace *pi,
 	else
 		*pi->bits = mul_4x8_8(pi->color, opacity);
 	sna_image_composite(pi->op, pi->source, NULL, pi->image,
-			0, 0, 0, 0, pi->dx + x, pi->dy + y, w, h);
+			    0, 0, 0, 0, pi->dx + x, pi->dy + y, w, h);
 }
 
 static void
@@ -936,18 +936,18 @@ pixmask_opacity(struct pixman_inplace *pi,
 		uint8_t opacity)
 {
 	if (opacity == 0xff) {
-		sna_image_composite(pi->op, pi->source, NULL, pi->image,
-				    pi->sx + x, pi->sy + y,
-				    0, 0,
-				    pi->dx + x, pi->dy + y,
-				    w, h);
+		pixman_image_composite(pi->op, pi->source, NULL, pi->image,
+				       pi->sx + x, pi->sy + y,
+				       0, 0,
+				       pi->dx + x, pi->dy + y,
+				       w, h);
 	} else {
 		*pi->bits = opacity;
-		sna_image_composite(pi->op, pi->source, pi->mask, pi->image,
-				    pi->sx + x, pi->sy + y,
-				    0, 0,
-				    pi->dx + x, pi->dy + y,
-				    w, h);
+		pixman_image_composite(pi->op, pi->source, pi->mask, pi->image,
+				       pi->sx + x, pi->sy + y,
+				       0, 0,
+				       pi->dx + x, pi->dy + y,
+				       w, h);
 	}
 }