[Intel-gfx] [PATCH] drm/i915: Check for timeout completion when waiting for the rq to submitted

[Chris Wilson]

On Wed, Feb 15, 2017 at 02:54:40PM +0200, Joonas Lahtinen wrote:
> On ke, 2017-02-08 at 16:54 +0000, Chris Wilson wrote:
> > We first wait for a request to be submitted to hw and assigned a seqno,
> > before we can wait for the hw to signal completion (otherwise we don't
> > know the hw id we need to wait upon). Whilst waiting for the request to
> > be submitted, we may exceed the user's timeout and need to propagate the
> > error back.
> > 
> > Reported-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> > Fixes: 4680816be336 ("drm/i915: Wait first for submission, before waiting for request completion")
> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> > Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> > Cc: <drm-intel-fixes at lists.freedesktop.org> # v4.10-rc1+
> 
> <SNIP>
> 
> > +++ b/drivers/gpu/drm/i915/i915_gem_request.c
> > @@ -1084,6 +1084,9 @@ long i915_wait_request(struct drm_i915_gem_request *req,
> >  		if (timeout < 0)
> >  			goto complete;
> >  
> > +		if (!timeout)
> > +			return -ETIME;
> > +
> 
> Misses the tracepoint, if that's deliberate;

Hmm, this should be ret = -ETIME; goto complete; It is at the end of the
series, or at least at the end in my current tree.

Ah, yes, v2 of this patch is already in the tree. Thanks,
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre