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

Message ID 20191015093915.3995-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • drm/i915: Drop obj.page_pin_count after a failed vma->set_pages()
Related show

Commit Message

Chris Wilson Oct. 15, 2019, 9:39 a.m. UTC
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>
---
 drivers/gpu/drm/i915/i915_vma.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Matthew Auld Oct. 15, 2019, 9:44 a.m. UTC | #1
On Tue, 15 Oct 2019 at 10:39, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>
> 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>

Patch
diff mbox series

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