Skip to content

Commit 3a7b726

Browse files
drm/i915/selftest: Bump selftest timeouts for hangcheck
Some testing environments and some heavier tests are slower than previous limits allowed for. For example, it can take multiple seconds for the 'context has been reset' notification handler to reach the 'kill the requests' code in the 'active' version of the 'reset engines' test. During which time the selftest gets bored, gives up waiting and fails the test. There is also an async thread that the selftest uses to pump work through the hardware in parallel to the context that is marked for reset. That also could get bored waiting for completions and kill the test off. Lastly, the flush at the of various test sections can also see timeouts due to the large amount of work backed up. This is also true of the live_hwsp_read test. Signed-off-by: John Harrison <[email protected]> Signed-off-by: Matthew Brost <[email protected]> Cc: Daniele Ceraolo Spurio <[email protected]> Reviewed-by: Matthew Brost <[email protected]> Signed-off-by: John Harrison <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 617e87c commit 3a7b726

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

drivers/gpu/drm/i915/gt/selftest_hangcheck.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ static int active_request_put(struct i915_request *rq)
879879
if (!rq)
880880
return 0;
881881

882-
if (i915_request_wait(rq, 0, 5 * HZ) < 0) {
882+
if (i915_request_wait(rq, 0, 10 * HZ) < 0) {
883883
GEM_TRACE("%s timed out waiting for completion of fence %llx:%lld\n",
884884
rq->engine->name,
885885
rq->fence.context,

drivers/gpu/drm/i915/selftests/igt_flush_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ int igt_flush_test(struct drm_i915_private *i915)
1919

2020
cond_resched();
2121

22-
if (intel_gt_wait_for_idle(gt, HZ / 5) == -ETIME) {
22+
if (intel_gt_wait_for_idle(gt, HZ) == -ETIME) {
2323
pr_err("%pS timed out, cancelling all further testing.\n",
2424
__builtin_return_address(0));
2525

drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#define REDUCED_TIMESLICE 5
1414
#define REDUCED_PREEMPT 10
15-
#define WAIT_FOR_RESET_TIME 1000
15+
#define WAIT_FOR_RESET_TIME 10000
1616

1717
int intel_selftest_modify_policy(struct intel_engine_cs *engine,
1818
struct intel_selftest_saved_policy *saved,

0 commit comments

Comments
 (0)