From bac21eb5225753c91900e8eaa1804e5fb7130dd2 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 11 Aug 2021 03:10:43 +0000 Subject: [PATCH] Revert "drm/i915: Propagate errors on awaiting already signaled fences" From Jason Ekstrand 118b070bf415eb6c0fa39e5fa1b1ef6b83e80cee in linux 5.10.y/5.10.57 3761baae908a7b5012be08d70fa553cc2eb82305 in mainline linux --- sys/dev/pci/drm/i915/i915_request.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/pci/drm/i915/i915_request.c b/sys/dev/pci/drm/i915/i915_request.c index 31fe9f84826..5883dab1dcc 100644 --- a/sys/dev/pci/drm/i915/i915_request.c +++ b/sys/dev/pci/drm/i915/i915_request.c @@ -1357,10 +1357,8 @@ i915_request_await_execution(struct i915_request *rq, do { fence = *child++; - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { - i915_sw_fence_set_error_once(&rq->submit, fence->error); + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) continue; - } if (fence->context == rq->fence.context) continue; @@ -1458,10 +1456,8 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) do { fence = *child++; - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { - i915_sw_fence_set_error_once(&rq->submit, fence->error); + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) continue; - } /* * Requests on the same timeline are explicitly ordered, along -- 2.20.1