commit 50251bcb2e8783f86ebdd86ce38adc9e3777f82f
author Chris Wilson <chris@chris-wilson.co.uk> Sun Aug 18 10:46:53 2019 +0100
committer Chris Wilson <chris@chris-wilson.co.uk> Tue Aug 20 09:50:00 2019 +0100
tree 6360239550d6f2d52386d10727d1878420e9d6d0
parent ce130a078c85ce3f2bdb02047cba5b72702a79c3

i915/gem_concurrent_blit: Do not try to idle while submitting in parallel

If we try to idle while another thread is submitting, we will be forced
to wait until that other thread is finished -- effectively serialising
the parallel workloads, defeating said purpose.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Stuart Summers <stuart.summers@intel.com>

tests/i915/gem_concurrent_all.c

diff --git a/tests/i915/gem_concurrent_all.c b/tests/i915/gem_concurrent_all.c
index 3ddaab8..266995d 100644
--- a/tests/i915/gem_concurrent_all.c
+++ b/tests/i915/gem_concurrent_all.c
@@ -968,8 +968,6 @@
 		      do_copy do_copy_func,
 		      do_hang do_hang_func)
 {
-	gem_quiescent_gpu(fd);
-
 	buffers->mode->set_bo(buffers, buffers->src[0], 0xdeadbeef);
 	for (int i = 0; i < buffers->count; i++) {
 		igt_hang_t hang = do_hang_func();
@@ -985,8 +983,6 @@
 		      do_copy do_copy_func,
 		      do_hang do_hang_func)
 {
-	gem_quiescent_gpu(fd);
-
 	for (int i = 0; i < buffers->count; i++) {
 		igt_hang_t hang = do_hang_func();
 
@@ -1007,8 +1003,6 @@
 {
 	igt_hang_t hang;
 
-	gem_quiescent_gpu(fd);
-
 	for (int i = 0; i < buffers->count; i++) {
 		buffers->mode->set_bo(buffers, buffers->src[i], i);
 		buffers->mode->set_bo(buffers, buffers->dst[i], ~i);
@@ -1034,7 +1028,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = 0; i < buffers->count; i++) {
 		buffers->mode->set_bo(buffers, buffers->src[i], i);
 		buffers->mode->set_bo(buffers, buffers->dst[i], ~i);
@@ -1058,7 +1051,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = 0; i < half; i++) {
 		buffers->mode->set_bo(buffers, buffers->src[i], i);
 		buffers->mode->set_bo(buffers, buffers->dst[i], ~i);
@@ -1102,7 +1094,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = 0; i < buffers->count; i++) {
 		buffers->mode->set_bo(buffers, buffers->src[i], i);
 		buffers->mode->set_bo(buffers, buffers->dst[i], ~i);
@@ -1123,7 +1114,6 @@
 {
 	igt_hang_t hang;
 
-	gem_quiescent_gpu(fd);
 	buffers->mode->set_bo(buffers, buffers->src[0], 0);
 	buffers->mode->set_bo(buffers, buffers->dst[0], ~0);
 	do_copy_func(buffers, buffers->dst[0], buffers->src[0]);
@@ -1142,7 +1132,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = 0; i < buffers->count; i++) {
 		buffers->mode->set_bo(buffers, buffers->src[i], 0xdeadbeef^~i);
 		buffers->mode->set_bo(buffers, buffers->dst[i], i);
@@ -1196,7 +1185,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = buffers->count; i--; )
 		buffers->mode->set_bo(buffers, buffers->src[i], 0xdeadbeef);
 	for (i = 0; i < buffers->count; i++)
@@ -1214,7 +1202,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = buffers->count; i--; )
 		buffers->mode->set_bo(buffers, buffers->src[i], 0xdeadbeef ^ i);
 	for (i = 0; i < buffers->count; i++) {
@@ -1235,7 +1222,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = buffers->count; i--; )
 		buffers->mode->set_bo(buffers, buffers->src[i], 0xdeadbeef ^ i);
 	for (i = 0; i < buffers->count; i++) {
@@ -1255,7 +1241,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = buffers->count; i--; )
 		buffers->mode->set_bo(buffers, buffers->src[i], 0xdeadbeef ^ i);
 	for (i = 0; i < buffers->count; i++) {
@@ -1276,7 +1261,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = buffers->count; i--; )
 		buffers->mode->set_bo(buffers, buffers->src[i], 0xdeadbeef ^ i);
 	for (i = 0; i < buffers->count; i++) {
@@ -1296,7 +1280,6 @@
 	igt_hang_t hang;
 	int i;
 
-	gem_quiescent_gpu(fd);
 	for (i = buffers->count; i--; )
 		buffers->mode->set_bo(buffers, buffers->src[i], 0xabcdabcd);
 	for (i = 0; i < buffers->count; i++)