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

Commit 8c0aa2f8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Do not double free pages in kgsl_memdesc"

parents 05d1205f dab1548b

drivers/gpu/msm/kgsl_pool.c

+8 −0
Original line number Diff line number Diff line
@@ -253,12 +253,20 @@ void kgsl_pool_free_pages(struct page **pages, unsigned int pcount) 
	if (pages == NULL || pcount == 0)

		return;



	if (WARN(!kern_addr_valid((unsigned long)pages),

		"Address of pages=%pK is not valid\n", pages))

		return;



	for (i = 0; i < pcount;) {

		/*

		 * Free each page or compound page group individually.

		 */

		struct page *p = pages[i];



		if (WARN(!kern_addr_valid((unsigned long)p),

			"Address of page=%pK is not valid\n", p))

			return;



		i += 1 << compound_order(p);

		kgsl_pool_free_page(p);

	}

drivers/gpu/msm/kgsl_sharedmem.c

+2 −0
Original line number Diff line number Diff line
@@ -1070,7 +1070,9 @@ void kgsl_sharedmem_free(struct kgsl_memdesc *memdesc) 
		kvfree(memdesc->sgt);

	}



	memdesc->page_count = 0;

	kvfree(memdesc->pages);

	memdesc->pages = NULL;

}

EXPORT_SYMBOL(kgsl_sharedmem_free);