projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v5.14-rc3 into usb-next
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_request.c
diff --git
a/drivers/gpu/drm/i915/i915_request.c
b/drivers/gpu/drm/i915/i915_request.c
index
1014c71
..
37aef13
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_request.c
+++ b/
drivers/gpu/drm/i915/i915_request.c
@@
-1426,10
+1426,8
@@
i915_request_await_execution(struct i915_request *rq,
do {
fence = *child++;
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;
continue;
- }
if (fence->context == rq->fence.context)
continue;
if (fence->context == rq->fence.context)
continue;
@@
-1527,10
+1525,8
@@
i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence)
do {
fence = *child++;
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;
continue;
- }
/*
* Requests on the same timeline are explicitly ordered, along
/*
* Requests on the same timeline are explicitly ordered, along