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

Commit 7e65e032 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Deregister gpu address on memdesc_sg_virt failure"

parents 36f6d917 16cdeb5b

drivers/gpu/msm/kgsl.c

+8 −2
Original line number Diff line number Diff line
@@ -2195,6 +2195,8 @@ static int kgsl_setup_anon_useraddr(struct kgsl_pagetable *pagetable, 
{

	/* Map an anonymous memory chunk */



	int ret;



	if (size == 0 || offset != 0 ||

		!IS_ALIGNED(size, PAGE_SIZE))

		return -EINVAL;
@@ -2204,7 +2206,6 @@ static int kgsl_setup_anon_useraddr(struct kgsl_pagetable *pagetable, 
	entry->memdesc.flags |= (uint64_t)KGSL_MEMFLAGS_USERMEM_ADDR;



	if (kgsl_memdesc_use_cpu_map(&entry->memdesc)) {

		int ret;



		/* Register the address in the database */

		ret = kgsl_mmu_set_svm_region(pagetable,
@@ -2216,7 +2217,12 @@ static int kgsl_setup_anon_useraddr(struct kgsl_pagetable *pagetable, 
		entry->memdesc.gpuaddr = (uint64_t) hostptr;

	}



	return memdesc_sg_virt(&entry->memdesc, hostptr);

	ret = memdesc_sg_virt(&entry->memdesc, hostptr);



	if (ret && kgsl_memdesc_use_cpu_map(&entry->memdesc))

		kgsl_mmu_put_gpuaddr(&entry->memdesc);



	return ret;

}



#ifdef CONFIG_DMA_SHARED_BUFFER

drivers/gpu/msm/kgsl_mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -439,7 +439,8 @@ void kgsl_mmu_put_gpuaddr(struct kgsl_memdesc *memdesc) 
	if (memdesc->size == 0 || memdesc->gpuaddr == 0)

		return;



	if (!kgsl_memdesc_is_global(memdesc))

	if (!kgsl_memdesc_is_global(memdesc) &&

			(KGSL_MEMDESC_MAPPED & memdesc->priv))

		unmap_fail = kgsl_mmu_unmap(pagetable, memdesc);



	/*