From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 21 Nov 2019 23:30:21 +0000 (+0000)
Subject: drm/i915/selftests: Shorten infinite wait for sseu
X-Git-Tag: v5.6-rc1~114^2~17^2~286
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f05bfce3341208de93e4fd08bdb635dc671afec4;p=users%2Fjedix%2Flinux-maple.git

drm/i915/selftests: Shorten infinite wait for sseu

Use our more regular igt_flush_test() to bind the wait-for-idle and
error out instead of waiting around forever on critical failure.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Stuart Summers <stuart.summers@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191121233021.507400-1-chris@chris-wilson.co.uk
---

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index f1ce5f64b221..e1d8ccd11409 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -1168,8 +1168,7 @@ out:
 		igt_spinner_end(spin);
 
 	if ((flags & TEST_IDLE) && ret == 0) {
-		ret = intel_gt_wait_for_idle(ce->engine->gt,
-					     MAX_SCHEDULE_TIMEOUT);
+		ret = igt_flush_test(ce->engine->i915);
 		if (ret)
 			return ret;