xf86-video-intel: 2 commits - src/sna/kgem.c test/lowlevel-blt-bench.c

[Chris Wilson]

 src/sna/kgem.c            |    2 +-
 test/lowlevel-blt-bench.c |   33 +++++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)

New commits:
commit c25fa2216a3674f564a7e35d263a5d405aa97816
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 30 14:13:13 2014 +0100

    sna: Tweak preference for small GPU bo
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 3f56c32..b6f5393 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4270,7 +4270,7 @@ unsigned kgem_can_create_2d(struct kgem *kgem,
 	if (size > 0) {
 		if (size <= kgem->max_cpu_size)
 			flags |= KGEM_CAN_CREATE_CPU;
-		else if (size <= kgem->max_gpu_size)
+		if (size > 4096 && size <= kgem->max_gpu_size)
 			flags |= KGEM_CAN_CREATE_GPU;
 		if (size <= PAGE_SIZE*kgem->aperture_mappable/4)
 			flags |= KGEM_CAN_CREATE_GTT;
commit 19a62e088f5202026bdfde7a8af36598b69f8243
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 30 11:20:54 2014 +0100

    test/lowlevel-blt-bench: Update progress more frequently
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/lowlevel-blt-bench.c b/test/lowlevel-blt-bench.c
index 7f6f524..63f6815 100644
--- a/test/lowlevel-blt-bench.c
+++ b/test/lowlevel-blt-bench.c
@@ -332,16 +332,24 @@ static void bench_source(struct test *t, enum target target, int op, int src)
 {
 	double out, ref;
 
+	fprintf(stdout, "%28s with %s: ", source[src].name, ops[op].name);
+	fflush(stdout);
+
 	ref = _bench_source(&t->ref, target, op, src, 1000);
-	if (ref < 0)
+	if (ref < 0) {
+		fprintf(stdout, "SKIP\n");
 		return;
+	}
+	fprintf(stdout, "ref=%f, ", ref);
+	fflush(stdout);
 
 	out = _bench_source(&t->out, target, op, src, 1000);
-	if (out < 0)
+	if (out < 0) {
+		fprintf(stdout, "SKIP\n");
 		return;
+	}
 
-	fprintf (stdout, "%28s with %s: ref=%f, out=%f\n",
-		 source[src].name, ops[op].name, ref, out);
+	fprintf(stdout, "out=%f\n", out);
 }
 
 static double _bench_mask(struct test_display *t, enum target target_type,
@@ -386,16 +394,25 @@ static void bench_mask(struct test *t, enum target target, int op, int src, int
 {
 	double out, ref;
 
+	fprintf(stdout, "%28s In %28s with %s: ",
+		source[src].name, source[mask].name, ops[op].name);
+	fflush(stdout);
+
 	ref = _bench_mask(&t->ref, target, op, src, mask, 1000);
-	if (ref < 0)
+	if (ref < 0) {
+		fprintf(stdout, "SKIP\n");
 		return;
+	}
+	fprintf(stdout, "ref=%f, ", ref);
+	fflush(stdout);
 
 	out = _bench_mask(&t->out, target, op, src, mask, 1000);
-	if (out < 0)
+	if (out < 0) {
+		fprintf(stdout, "SKIP\n");
 		return;
+	}
 
-	fprintf (stdout, "%28s In %28s with %s: ref=%f, out=%f\n",
-		 source[src].name, source[mask].name, ops[op].name, ref, out);
+	fprintf(stdout, "out=%f\n", out);
 }
 
 int main(int argc, char **argv)