Commit bc850943 authored by Chris Wilson's avatar Chris Wilson Committed by Rodrigo Vivi

drm/i915: Propagate error from completed fences

We need to preserve fatal errors from fences that are being terminated
as we hook them up.

Fixes: ef468849 ("drm/i915: Propagate fence errors")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200506162136.3325-1-chris@chris-wilson.co.uk
(cherry picked from commit 24fe5f2a)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 1bc6a601
...@@ -1017,8 +1017,10 @@ i915_request_await_request(struct i915_request *to, struct i915_request *from) ...@@ -1017,8 +1017,10 @@ i915_request_await_request(struct i915_request *to, struct i915_request *from)
GEM_BUG_ON(to == from); GEM_BUG_ON(to == from);
GEM_BUG_ON(to->timeline == from->timeline); GEM_BUG_ON(to->timeline == from->timeline);
if (i915_request_completed(from)) if (i915_request_completed(from)) {
i915_sw_fence_set_error_once(&to->submit, from->fence.error);
return 0; return 0;
}
if (to->engine->schedule) { if (to->engine->schedule) {
ret = i915_sched_node_add_dependency(&to->sched, &from->sched); ret = i915_sched_node_add_dependency(&to->sched, &from->sched);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment