mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 15:49:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Drop obj.page_pin_count after a failed vma->set_pages()

Browse Source 
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
This commit is contained in:
Chris Wilson
2019-10-15 10:39:15 +01:00
parent fa41d6ee90
commit 56184a20a8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_vma.c
View File

@@ -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);