[Intel-gfx] [PATCH] drm/i915: Actually emit the await_start

Tvrtko Ursulin tvrtko.ursulin at linux.intel.com
Thu Mar 5 11:04:00 UTC 2020


On 05/03/2020 10:42, Chris Wilson wrote:
> Fix the inverted test to emit the wait on the end of the previous
> request if we /haven't/ already.
> 
> Fixes: 6a79d848403d ("drm/i915: Lock signaler timeline while navigating")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
> Cc: <stable at vger.kernel.org> # v5.5+
> ---
>   drivers/gpu/drm/i915/i915_request.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> index 4bfe68edfc81..46dae33c1a20 100644
> --- a/drivers/gpu/drm/i915/i915_request.c
> +++ b/drivers/gpu/drm/i915/i915_request.c
> @@ -882,7 +882,7 @@ i915_request_await_start(struct i915_request *rq, struct i915_request *signal)
>   		return 0;
>   
>   	err = 0;
> -	if (intel_timeline_sync_is_later(i915_request_timeline(rq), fence))
> +	if (!intel_timeline_sync_is_later(i915_request_timeline(rq), fence))
>   		err = i915_sw_fence_await_dma_fence(&rq->submit,
>   						    fence, 0,
>   						    I915_FENCE_GFP);
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko


More information about the Intel-gfx mailing list