[PATCH i-g-t v2 16/17] tests/gem_ppgtt: WIP on rewrite test

[Zbigniew Kempczyński]

Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
---
 tests/i915/gem_ppgtt.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/i915/gem_ppgtt.c b/tests/i915/gem_ppgtt.c
index 73bd19c5..068d8b57 100644
--- a/tests/i915/gem_ppgtt.c
+++ b/tests/i915/gem_ppgtt.c
@@ -87,7 +87,7 @@ static void fork_rcs_copy(int timeout, uint32_t final,
 	mem_per_child = SIZE;
 	if (flags & CREATE_CONTEXT)
 		mem_per_child += 2 * 128 * 1024; /* rough context sizes */
-	intel_require_memory(count, mem_per_child, CHECK_RAM);
+	//intel_require_memory(count, mem_per_child, CHECK_RAM);
 
 	for (int child = 0; child < count; child++) {
 		int fd = drm_open_driver(DRIVER_INTEL);
@@ -126,6 +126,7 @@ static void fork_rcs_copy(int timeout, uint32_t final,
 				    dst[child], 0, 0);
 
 			intel_buf_destroy(src);
+			intel_bb_reset(ibb, true);
 		}
 
 		src = create_bo(dst[child]->bops,
@@ -136,6 +137,7 @@ static void fork_rcs_copy(int timeout, uint32_t final,
 			    dst[child], 0, 0);
 
 		intel_buf_destroy(src);
+		dst[child]->addr.offset = INTEL_BUF_INVALID_ADDRESS;
 
 		intel_bb_destroy(ibb);
 	}
@@ -175,6 +177,7 @@ static void fork_bcs_copy(int timeout, uint32_t final,
 
 			intel_buf_destroy(src[1]);
 			intel_buf_destroy(src[0]);
+			intel_bb_reset(ibb, true);
 		}
 
 		src[0] = create_bo(dst[child]->bops, ~0);
@@ -190,6 +193,7 @@ static void fork_bcs_copy(int timeout, uint32_t final,
 
 		intel_buf_destroy(src[1]);
 		intel_buf_destroy(src[0]);
+		dst[child]->addr.offset = INTEL_BUF_INVALID_ADDRESS;
 
 		intel_bb_destroy(ibb);
 	}
@@ -287,9 +291,10 @@ igt_main
 
 	igt_subtest("blt-vs-render-ctx0") {
 		struct intel_buf *bcs[1], *rcs[N_CHILD];
+		intel_allocator_multiprocess_start();
 
-		fork_bcs_copy(30, 0x4000, bcs, 1);
-		fork_rcs_copy(30, 0x8000 / N_CHILD, rcs, N_CHILD, 0);
+		fork_bcs_copy(3, 0x4000, bcs, 1);
+		fork_rcs_copy(3, 0x8000 / N_CHILD, rcs, N_CHILD, 0);
 
 		igt_waitchildren();
 
@@ -298,6 +303,8 @@ igt_main
 
 		cleanup_bufs(bcs, 1);
 		cleanup_bufs(rcs, N_CHILD);
+
+		intel_allocator_multiprocess_stop();
 	}
 
 	igt_subtest("blt-vs-render-ctxN") {
-- 
2.26.0