summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_vma.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2020-04-02 00:01:04 +0300
committerChris Wilson <chris@chris-wilson.co.uk>2020-04-02 01:34:17 +0300
commit0d86ee35097ae0f1c2c50f2b8035ef480e25e4f1 (patch)
tree24bb1feefc61a27a9df610080cb136b258f1f9f9 /drivers/gpu/drm/i915/i915_vma.c
parent725c9ee7fc6ddbfd0f0fa3e59b8021e9420a3198 (diff)
downloadlinux-0d86ee35097ae0f1c2c50f2b8035ef480e25e4f1.tar.xz
drm/i915/gt: Make fence revocation unequivocal
If we must revoke the fence because the VMA is no longer present, or because the fence no longer applies, ensure that we do and convert it into an error if we try but cannot. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200401210104.15907-3-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_vma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_vma.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 616ca5a7c875..b5f78b0acf5d 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -1298,9 +1298,7 @@ int __i915_vma_unbind(struct i915_vma *vma)
i915_vma_flush_writes(vma);
/* release the fence reg _after_ flushing */
- ret = i915_vma_revoke_fence(vma);
- if (ret)
- return ret;
+ i915_vma_revoke_fence(vma);
/* Force a pagefault for domain tracking on next user access */
i915_vma_revoke_mmap(vma);