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
/
gt
/
intel_ggtt_fencing.c
diff --git
a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
index
cac7f3f
..
f8948de
100644
(file)
--- a/
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
+++ b/
drivers/gpu/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)