diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-15 10:39:15 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-15 11:46:40 +0100 |
| commit | 56184a20a80037c39fccc78b683cf593a2db4c5f (patch) | |
| tree | ec56d8129bb995a12a69cf8addf375c803ed28b5 /drivers/gpu/drm/i915/i915_vma.c | |
| parent | fa41d6ee904266fa8739cafa6ec038c3a8e435b7 (diff) | |
| download | linux-stable-56184a20a80037c39fccc78b683cf593a2db4c5f.tar.gz linux-stable-56184a20a80037c39fccc78b683cf593a2db4c5f.tar.bz2 linux-stable-56184a20a80037c39fccc78b683cf593a2db4c5f.zip | |
drm/i915: Drop obj.page_pin_count after a failed vma->set_pages()
Before we attempt to set_pages on the vma, we claim a
obj.pages_pin_count for it. If we subsequently fail to set the pages on
the vma, we need to drop our pinning before returning the error.
Reported-by: Matthew Auld <matthew.auld@intel.com>
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/20191015093915.3995-1-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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 9fdcd4e2c799..7d936254bde7 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -802,8 +802,11 @@ static int vma_get_pages(struct i915_vma *vma) } err = vma->ops->set_pages(vma); - if (err) + if (err) { + if (vma->obj) + i915_gem_object_unpin_pages(vma->obj); goto unlock; + } } atomic_inc(&vma->pages_count); |