leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Propagate errors on awaiting already signaled dma-fences

Browse Source 
If we see an already signaled dma-fence that we want to await on, we skip
adding to the i915_sw_fence. However, we should pay attention to whether
there was an error on that fence and if so propagate it for our future
request.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191206160428.1503343-3-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-12-06 16:04:28 +00:00
parent 9e31c1fe45
commit cbab8d87f7
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/i915/i915_sw_fence.c
View File

@ -428,8 +428,10 @@ static void dma_i915_sw_fence_wake_timer(struct dma_fence *dma,
struct i915_sw_fence *fence;
fence = xchg(&cb->base.fence, NULL);
if (fence)
if (fence) {
i915_sw_fence_set_error_once(fence, dma->error);
i915_sw_fence_complete(fence);
}
irq_work_queue(&cb->work);
}
@ -457,8 +459,10 @@ int i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
debug_fence_assert(fence);
might_sleep_if(gfpflags_allow_blocking(gfp));
if (dma_fence_is_signaled(dma))
if (dma_fence_is_signaled(dma)) {
i915_sw_fence_set_error_once(fence, dma->error);
return 0;
}
cb = kmalloc(timeout ?
sizeof(struct i915_sw_dma_fence_cb_timer) :
@ -468,7 +472,12 @@ int i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
if (!gfpflags_allow_blocking(gfp))
return -ENOMEM;
return dma_fence_wait(dma, false);
ret = dma_fence_wait(dma, false);
if (ret)
return ret;
i915_sw_fence_set_error_once(fence, dma->error);
return 0;
}
cb->fence = fence;
@ -518,8 +527,10 @@ int __i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
debug_fence_assert(fence);
if (dma_fence_is_signaled(dma))
if (dma_fence_is_signaled(dma)) {
i915_sw_fence_set_error_once(fence, dma->error);
return 0;
}
cb->fence = fence;
i915_sw_fence_await(fence);
@ -553,8 +564,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
struct dma_fence **shared;
unsigned int count, i;
ret = dma_resv_get_fences_rcu(resv,
&excl, &count, &shared);
ret = dma_resv_get_fences_rcu(resv, &excl, &count, &shared);
if (ret)
return ret;