| Message ID | 20191121233021.507400-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/selftests: Shorten infinite wait for sseu | expand |
On Thu, 2019-11-21 at 23:30 +0000, Chris Wilson wrote: > 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> Yeah, seems like a better approach here. Should we just be passing gt to that though? Doesn't look like we actually use the private data outside of that. Of course that's completely unrelated to this change. Reviewed-by: Stuart Summers <stuart.summers@intel.com> > --- > drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > 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 @@ __sseu_finish(const char *name, > 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; >
Quoting Summers, Stuart (2019-11-22 01:58:49) > On Thu, 2019-11-21 at 23:30 +0000, Chris Wilson wrote: > > 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> > > Yeah, seems like a better approach here. Should we just be passing gt > to that though? Doesn't look like we actually use the private data > outside of that. Of course that's completely unrelated to this change. Yes/no. We actually need two igt_flush_test() variants, one gt centric and one device centric. I do have a patch to convert igt_flush_test over to intel_gt, and while that looks better inside gt/, outside it frequently looks revolting. So that patch got shelved until someone finds a moment to sort out the names and semantics we need. -Chris
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 @@ __sseu_finish(const char *name, 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;
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> --- drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)