drm/i915/selftests: Teach hang-self to target only itself

We have a test case to exercise resetting an engine while the other
engines are busy, all the TEST_SELF adds on top is that the target
engine also has background activity. In this case it is useful to first
test resetting the engine while there is background activity, as a
separate flag from exercising all others.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200607222108.14401-3-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
index 035f363fb0f826b86857fc1da4930f9143b7b508..2af66f8ffbd2d72e94291c7d3b1e05c5b10c02fd 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
@@ -805,10 +805,10 @@ static int __igt_reset_engines(struct intel_gt *gt,
                        threads[tmp].resets =
                                i915_reset_engine_count(global, other);
 
-                       if (!(flags & TEST_OTHERS))
+                       if (other == engine && !(flags & TEST_SELF))
                                continue;
 
-                       if (other == engine && !(flags & TEST_SELF))
+                       if (other != engine && !(flags & TEST_OTHERS))
                                continue;
 
                        threads[tmp].engine = other;
@@ -999,7 +999,7 @@ static int igt_reset_engines(void *arg)
                },
                {
                        "self-priority",
-                       TEST_OTHERS | TEST_ACTIVE | TEST_PRIORITY | TEST_SELF,
+                       TEST_ACTIVE | TEST_PRIORITY | TEST_SELF,
                },
                { }
        };