diff mbox

[i-g-t] tests/gem_ctx_exec.c: only hang the ring we are testing

Message ID 1439982616-13765-1-git-send-email-tim.gore@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

tim.gore@intel.com Aug. 19, 2015, 11:10 a.m. UTC 
From: Tim Gore <tim.gore@intel.com>

In the reset-pin-leak test we were calling
igt_set_stop_rings(STOP_RING_DEFAULTS) which sets the
stop_rings bits for all gpu engines. But we only submit
work to the render engine. When TDR is enabled (as it is
in Android currently) only the render engine gets reset,
which clears the stop_rings bit for the render engine but
not for the other engines. This causes the test to fail on
the second iteration because stop_rings is not clear.

So just set the stop_rings bit for the engine we are going
to hang, namely the render engine.

Signed-off-by: Tim Gore <tim.gore@intel.com>
---
 tests/gem_ctx_exec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c
index 3df939c..b4e7f31 100644
--- a/tests/gem_ctx_exec.c
+++ b/tests/gem_ctx_exec.c
@@ -207,7 +207,7 @@  igt_main
 		 * the last context is leaked at every reset.
 		 */
 		for (i = 0; i < 20; i++) {
-			igt_set_stop_rings(STOP_RING_DEFAULTS);
+                        igt_set_stop_rings(igt_to_stop_ring_flag(I915_EXEC_RENDER));
 			igt_assert(exec(fd, handle, I915_EXEC_RENDER, 0) == 0);
 			igt_assert(exec(fd, handle, I915_EXEC_RENDER, ctx_id) == 0);
 			gem_sync(fd, handle);