From 1c798f7a2ea94471c9722646b9627f4eb0f03405 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 21 Jul 2021 00:53:30 +0000 Subject: [PATCH] drm/i915/gt: Fix -EDEADLK handling regression 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b80eb75a897..036beed894e 100644 --- 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(-EDEADLK); + return ERR_PTR(-ENOBUFS); } int __i915_vma_pin_fence(struct i915_vma *vma) -- 2.20.1