To actually DROP_IDLE means that we have to wait for ongoing submission,
and any new concurrently submitted, i.e. it should only be called during
single-threaded submission to ensure the GPU is idle before the new
action.
v2: Also include SHRINK for thrash-all-the-things, and find a dupe in
gem_reloc_vs_gpu.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
---
tests/i915/gem_persistent_relocs.c | 9 ++++++---
tests/i915/gem_reloc_vs_gpu.c | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/tests/i915/gem_persistent_relocs.c b/tests/i915/gem_persistent_relocs.c
index 452fe686e..dff4e9a76 100644
--- a/tests/i915/gem_persistent_relocs.c
+++ b/tests/i915/gem_persistent_relocs.c
@@ -281,10 +281,13 @@ static void do_forked_test(int fd, unsigned flags)
struct igt_helper_process thrasher = {};
if (flags & (THRASH | THRASH_INACTIVE)) {
- uint64_t val = (flags & THRASH_INACTIVE) ?
- (DROP_RETIRE | DROP_BOUND | DROP_UNBOUND) : DROP_ALL;
-
igt_fork_helper(&thrasher) {
+ uint64_t val;
+
+ val = DROP_RETIRE | DROP_BOUND | DROP_UNBOUND;
+ if (!(flags & THRASH_INACTIVE))
+ val |= DROP_ACTIVE | DROP_SHRINK_ALL;
+
while (1) {
usleep(1000);
igt_drop_caches_set(fd, val);
diff --git a/tests/i915/gem_reloc_vs_gpu.c b/tests/i915/gem_reloc_vs_gpu.c
index d421e4340..328730a9b 100644
--- a/tests/i915/gem_reloc_vs_gpu.c
+++ b/tests/i915/gem_reloc_vs_gpu.c
@@ -258,10 +258,13 @@ static void do_forked_test(int fd, unsigned flags)
igt_require_hang_ring(fd, I915_EXEC_BLT);
if (flags & (THRASH | THRASH_INACTIVE)) {
- uint64_t val = (flags & THRASH_INACTIVE) ?
- (DROP_RETIRE | DROP_BOUND | DROP_UNBOUND) : DROP_ALL;
-
igt_fork_helper(&thrasher) {
+ uint64_t val;
+
+ val = DROP_RETIRE | DROP_BOUND | DROP_UNBOUND;
+ if (!(flags & THRASH_INACTIVE))
+ val |= DROP_ACTIVE | DROP_SHRINK_ALL;
+
while (1) {
usleep(1000);
igt_drop_caches_set(fd, val);
--
2.23.0.rc1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
