Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c479f438 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Daniel Vetter
Browse files

drm/i915: Do not leak pages when freeing userptr objects 



sg_alloc_table_from_pages() can build us a table with coalesced ranges which
means we need to iterate over pages and not sg table entries when releasing
page references.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Barbalho, Rafael" <rafael.barbalho@intel.com>
Tested-by: default avatarRafael Barbalho <rafael.barbalho@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
[danvet: Remove unused local variable sg.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent e9681366

drivers/gpu/drm/i915/i915_gem_userptr.c

+3 −4
Original line number Diff line number Diff line
@@ -689,16 +689,15 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) 
static void

i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj)

{

	struct scatterlist *sg;

	int i;

	struct sg_page_iter sg_iter;



	BUG_ON(obj->userptr.work != NULL);



	if (obj->madv != I915_MADV_WILLNEED)

		obj->dirty = 0;



	for_each_sg(obj->pages->sgl, sg, obj->pages->nents, i) {

		struct page *page = sg_page(sg);

	for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) {

		struct page *page = sg_page_iter_page(&sg_iter);



		if (obj->dirty)

			set_page_dirty(page);