Merge "msm: kgsl: Relocate the pagefault tracepoint" into msm-4.9 (2da32fd5) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/kgsl_iommu.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -813,6 +813,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))
		@@ -849,8 +856,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