diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-12-08 16:12:52 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-12-09 11:49:57 +0000 |
| commit | d3e483526cd3057936360503e3d7694d0bcb6eb2 (patch) | |
| tree | 1783d9b53d790d253c011680ecf0f28f08fc00ed /drivers/gpu/drm/i915/i915_vma.c | |
| parent | 16c46fd505fbe33ee480f8bb67aa3807b3507c72 (diff) | |
| download | linux-stable-d3e483526cd3057936360503e3d7694d0bcb6eb2.tar.gz linux-stable-d3e483526cd3057936360503e3d7694d0bcb6eb2.tar.bz2 linux-stable-d3e483526cd3057936360503e3d7694d0bcb6eb2.zip | |
drm/i915: Change i915_vma_unbind() to report -EAGAIN on activity
If someone else acquires the i915_vma before we complete our wait and
unbind it, we currently error out with -EBUSY. Use -EAGAIN instead so
that if necessary the caller is prepared to try again.
Closes: https://gitlab.freedesktop.org/drm/intel/issues/683
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191208161252.3015727-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_vma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 9ca6664c190c..6794c742fbbf 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -1181,7 +1181,7 @@ int __i915_vma_unbind(struct i915_vma *vma) GEM_BUG_ON(i915_vma_is_active(vma)); if (i915_vma_is_pinned(vma)) { vma_print_allocator(vma, "is pinned"); - return -EBUSY; + return -EAGAIN; } GEM_BUG_ON(i915_vma_is_active(vma)); |