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

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

Merge "msm: kgsl: Populate a valid pointer to page as vmf->page"

parents a2fc4c1e d1740fff

drivers/gpu/msm/kgsl_reclaim.c

+0 −2
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ static int kgsl_memdesc_get_reclaimed_pages(struct kgsl_mem_entry *entry) 
		return ret;



	memdesc->priv &= ~KGSL_MEMDESC_RECLAIMED;

	/* Allow reclaim of memdesc again in case vmfault disabled it */

	memdesc->priv &= ~KGSL_MEMDESC_SKIP_RECLAIM;



	return 0;

}

drivers/gpu/msm/kgsl_sharedmem.c

+6 −11
Original line number Diff line number Diff line
@@ -484,17 +484,12 @@ static int kgsl_page_alloc_vmfault(struct kgsl_memdesc *memdesc, 
	pgoff = offset >> PAGE_SHIFT;



	spin_lock(&memdesc->lock);

	if (memdesc->pages[pgoff])

		get_page(memdesc->pages[pgoff]);

	if (memdesc->pages[pgoff]) {

		page = memdesc->pages[pgoff];

		get_page(page);

	}

	else {

		/*

		 * We are here because the page is reclaimed.

		 * Mark the memdesc as non reclaimable to make

		 * sure that the page obtained here does not

		 * get reclaimed back leaving us with invalid

		 * page.

		 */

		memdesc->priv |= KGSL_MEMDESC_SKIP_RECLAIM;

		/* We are here because page was reclaimed */

		spin_unlock(&memdesc->lock);



		page = shmem_read_mapping_page_gfp(
@@ -518,7 +513,7 @@ static int kgsl_page_alloc_vmfault(struct kgsl_memdesc *memdesc, 
	}

	spin_unlock(&memdesc->lock);



	vmf->page = memdesc->pages[pgoff];

	vmf->page = page;



	atomic_long_add(PAGE_SIZE, &memdesc->mapsize);