Merge "msm: kgsl: Do not double free pages in kgsl_memdesc" (74ff77c2) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/gpu/msm/kgsl_pool.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -265,12 +265,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);
		}

+4 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2002,2007-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2002,2007-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1053,8 +1053,11 @@ void kgsl_sharedmem_free(struct kgsl_memdesc *memdesc)
		kfree(memdesc->sgt);
		}

		memdesc->page_count = 0;
		if (memdesc->pages)
		kgsl_free(memdesc->pages);
		memdesc->pages = NULL;

		}
		EXPORT_SYMBOL(kgsl_sharedmem_free);