On Wed, Mar 29, 2017 at 10:36:17PM +0100, Chris Wilson wrote: > Make i915_gem_wait_for_idle() be a little heavier in order to try and > guarantee that the GPU is indeed idle (by checking each engine > individually is idle, i.e. all writes are complete and the rings > stopped) after waiting for in-flight requests to be completed. > > References: https://bugs.freedesktop.org/show_bug.cgi?id=98836 > Signed-off-by: Chris Wilson <[email protected]> > --- > drivers/gpu/drm/i915/i915_gem.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index ec194d3e6cd3..5f0aff016eb1 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -3054,6 +3054,19 @@ static int wait_for_timeline(struct i915_gem_timeline > *tl, unsigned int flags) > return 0; > } > > +static int wait_for_engines(struct drm_i915_private *i915) > +{ > + struct intel_engine_cs *engine; > + enum intel_engine_id id; > + > + for_each_engine(engine, i915, id) { > + if (GEM_WARN_ON(wait_for(intel_engine_is_idle(engine), 50))) > + return -EBUSY; > + } > + > + return 0; > +} > + > int i915_gem_wait_for_idle(struct drm_i915_private *i915, unsigned int flags) > { > int ret; > @@ -3070,10 +3083,10 @@ int i915_gem_wait_for_idle(struct drm_i915_private > *i915, unsigned int flags) > if (ret) > return ret; > } > + > + ret = wait_for_engines(i915); > } else { > ret = wait_for_timeline(&i915->gt.global_timeline, flags); > - if (ret) > - return ret; > } > > return 0;
Forgot to change this to return ret; -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
