[igt-dev] [PATCH i-g-t v5 1/1] i915_pm_rpm: remove gem-execbuf-stress-extra-wait because same as gem-execbuf-stress

* [igt-dev] [PATCH i-g-t v5 1/1] i915_pm_rpm: remove gem-execbuf-stress-extra-wait because same as gem-execbuf-stress
@ 2019-03-20  8:12 Caz Yokoyama
  2019-03-20 16:34 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,v5,1/1] " Patchwork
  0 siblings, 1 reply; 2+ messages in thread
From: Caz Yokoyama @ 2019-03-20  8:12 UTC (permalink / raw)
  To: igt-dev

Extra 5sec delay does not add any value more than gem-execbuf-stress.
It waits until suspend state after a job is added by gem_execbuf().
There is no need to do more when GPU becomes suspended state.
I confirm this by looking at pm_runtime_force_suspend() which exits
on suspend state.

Signed-off-by: Caz Yokoyama <caz.yokoyama@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/i915_pm_rpm.c     | 9 ++++-----
 tests/intel-ci/blacklist.txt | 8 ++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
index 759c76ea..1908f78f 100644
--- a/tests/i915/i915_pm_rpm.c
+++ b/tests/i915/i915_pm_rpm.c
@@ -1338,12 +1338,13 @@ static void gem_execbuf_stress_subtest(int rounds, int wait_flags)
 	for (i = 0; i < rounds; i++) {
 		gem_execbuf(drm_fd, &execbuf);
 
-		if (wait_flags & WAIT_STATUS)
+		if (wait_flags & WAIT_STATUS) {
+			/* clean up idle work */
+			igt_drop_caches_set(drm_fd, DROP_IDLE);
 			igt_assert(wait_for_suspended());
+		}
 		if (wait_flags & WAIT_PC8_RES)
 			igt_assert(pc8_plus_residency_changed(30));
-		if (wait_flags & WAIT_EXTRA)
-			sleep(5);
 	}
 
 	gem_close(drm_fd, handle);
@@ -2083,8 +2084,6 @@ int main(int argc, char *argv[])
 		gem_execbuf_stress_subtest(rounds, WAIT_STATUS);
 	igt_subtest("gem-execbuf-stress-pc8")
 		gem_execbuf_stress_subtest(rounds, WAIT_PC8_RES);
-	igt_subtest("gem-execbuf-stress-extra-wait")
-		gem_execbuf_stress_subtest(rounds, WAIT_STATUS | WAIT_EXTRA);
 
 	/* power-wake reference tests */
 	igt_subtest("pm-tiling")
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index a2101ae7..a06509bd 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -15,6 +15,14 @@ igt@drm_mm(@.*)?
 igt@i915_module_load(@.*)?
 igt@i915_pm_rpm@module-reload
 ###############################################
+# Extra 5sec delay does not add any value more than gem-execbuf-stress.
+# It waits until suspend state after a job is added by gem_execbuf().
+# There is no need to do more when GPU becomes suspended state.
+# I confirm this by looking at pm_runtime_force_suspend() which exits
+# on suspend state.
+###############################################
+igt@i915_pm_rpm@gem-execbuf-stress-extra-wait
+###############################################
 # GEM
 ###############################################
 igt@gem_busy@(?!.*basic).*hang.*
-- 
2.17.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 2+ messages in thread