Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> writes:
> Just tidy up the return handling for completed dma-fences. While it may
> return errors for invalid fence, we already know that we have a good
> fence and the only error will be an already signaled fence.
>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_sw_fence.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
> index 7daf81f55c90..295b9829e2da 100644
> --- a/drivers/gpu/drm/i915/i915_sw_fence.c
> +++ b/drivers/gpu/drm/i915/i915_sw_fence.c
> @@ -546,13 +546,11 @@ int __i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
> cb->fence = fence;
> i915_sw_fence_await(fence);
>
> - ret = dma_fence_add_callback(dma, &cb->base, __dma_i915_sw_fence_wake);
> - if (ret == 0) {
> - ret = 1;
> - } else {
> + ret = 1;
> + if (dma_fence_add_callback(dma, &cb->base, __dma_i915_sw_fence_wake)) {
> + /* fence already signaled */
> __dma_i915_sw_fence_wake(dma, &cb->base);
> - if (ret == -ENOENT) /* fence already signaled */
> - ret = 0;
> + ret = 0;
> }
>
> return ret;
> --
> 2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
