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

Commit aad53a8c 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: Relocate the pagefault tracepoint"

parents dead6c82 bbee2b8f
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -799,6 +799,13 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,

	ptname = MMU_FEATURE(mmu, KGSL_MMU_GLOBAL_PAGETABLE) ?
		KGSL_MMU_GLOBAL_PT : tid;
	/*
	 * Trace needs to be logged before searching the faulting
	 * address in free list as it takes quite long time in
	 * search and delays the trace unnecessarily.
	 */
	trace_kgsl_mmu_pagefault(ctx->kgsldev, addr,
			ptname, write ? "write" : "read");

	if (test_bit(KGSL_FT_PAGEFAULT_LOG_ONE_PER_PAGE,
		&adreno_dev->ft_pf_policy))
@@ -835,8 +842,6 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
		}
	}

	trace_kgsl_mmu_pagefault(ctx->kgsldev, addr,
			ptname, write ? "write" : "read");

	/*
	 * We do not want the h/w to resume fetching data from an iommu