artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dad3d84
)
drm/i915/gt: Fix -EDEADLK handling regression
author
jsg
<jsg@openbsd.org>
Wed, 21 Jul 2021 00:53:30 +0000
(
00:53
+0000)
committer
jsg
<jsg@openbsd.org>
Wed, 21 Jul 2021 00:53:30 +0000
(
00:53
+0000)
From Ville Syrjala
0728df8048060e9bdedb9dd38c62782ee97184ba
in linux 5.10.y/5.10.52
2feeb52859fc1ab94cd35b61ada3a6ac4ff24243
in mainline linux
sys/dev/pci/drm/i915/gt/intel_ggtt_fencing.c
patch
|
blob
|
history
diff --git
a/sys/dev/pci/drm/i915/gt/intel_ggtt_fencing.c
b/sys/dev/pci/drm/i915/gt/intel_ggtt_fencing.c
index
b80eb75
..
036beed
100644
(file)
--- a/
sys/dev/pci/drm/i915/gt/intel_ggtt_fencing.c
+++ b/
sys/dev/pci/drm/i915/gt/intel_ggtt_fencing.c
@@
-348,7
+348,7
@@
static struct i915_fence_reg *fence_find(struct i915_ggtt *ggtt)
if (intel_has_pending_fb_unpin(ggtt->vm.i915))
return ERR_PTR(-EAGAIN);
- return ERR_PTR(-E
DEADLK
);
+ return ERR_PTR(-E
NOBUFS
);
}
int __i915_vma_pin_fence(struct i915_vma *vma)