Merge "msm: kgsl: Look for freed entries with the pagetable name" (11254932) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/kgsl_iommu.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -796,7 +796,7 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
		struct kgsl_iommu_context *ctx;
		u64 ptbase;
		u32 contextidr;
		pid_t tid = 0;
		pid_t pid = 0;
		pid_t ptname;
		struct _mem_entry prev, next;
		int write;
		@@ -851,7 +851,7 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
		if (context != NULL) {
		/* save pagefault timestamp for GFT */
		set_bit(KGSL_CONTEXT_PRIV_PAGEFAULT, &context->priv);
		tid = context->tid;
		pid = context->proc_priv->pid;
		}

		ctx->fault = 1;
		@@ -872,7 +872,7 @@ static int kgsl_iommu_fault_handler(struct iommu_domain *domain,
		contextidr = KGSL_IOMMU_GET_CTX_REG(ctx, CONTEXTIDR);

		ptname = MMU_FEATURE(mmu, KGSL_MMU_GLOBAL_PAGETABLE) ?
		KGSL_MMU_GLOBAL_PT : tid;
		KGSL_MMU_GLOBAL_PT : pid;
		/*
		* Trace needs to be logged before searching the faulting
		* address in free list as it takes quite long time in