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

Commit 2d3171d7 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: Correct memdesc conditions in cma_coherent_free"

parents e341fdb6 5f817153

drivers/gpu/msm/kgsl_sharedmem.c

+2 −2
Original line number Diff line number Diff line
@@ -486,9 +486,9 @@ static int kgsl_contiguous_vmfault(struct kgsl_memdesc *memdesc, 
static void kgsl_cma_coherent_free(struct kgsl_memdesc *memdesc)

{

	if (memdesc->hostptr) {

		if (memdesc->priv | KGSL_MEMDESC_SECURE) {

		if (memdesc->priv & KGSL_MEMDESC_SECURE) {

			kgsl_driver.stats.secure -= memdesc->size;

			if (memdesc->priv | KGSL_MEMDESC_TZ_LOCKED)

			if (memdesc->priv & KGSL_MEMDESC_TZ_LOCKED)

				kgsl_cma_unlock_secure(

				memdesc->pagetable->mmu->device, memdesc);

		} else