commit 354d9717c5a600fb063a6a83636a7ffc19362e25
author Sushmita Susheelendra <ssusheel@codeaurora.org> Thu Jul 28 17:16:49 2011 -0600
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 10:28:21 2011 -0700
tree 8ec96729c1206e64fe0ee2eedab7bb86e6e03dcc
parent 4283a4c56a1e3e77f281f018c841d9db1bbb5350

msm: kgsl: Use process specific pt_base in postmortem dump

When doing a look-up of the IB1 base address, use the pagetable
belonging to the respective process rather than the pagetable
belonging to the process in whose context the GPU hung.

Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>

drivers/gpu/msm/kgsl_mmu.c

diff --git a/drivers/gpu/msm/kgsl_mmu.c b/drivers/gpu/msm/kgsl_mmu.c
index 22c3467..fb2f63b 100644
--- a/drivers/gpu/msm/kgsl_mmu.c
+++ b/drivers/gpu/msm/kgsl_mmu.c
@@ -591,28 +591,36 @@
 	return ret;
 }
 
-void kgsl_mmu_pagefault(struct kgsl_device *device)
+int
+kgsl_get_ptname_from_ptbase(unsigned int pt_base)
 {
-	unsigned int reg;
-	unsigned int ptbase;
 	struct kgsl_pagetable *pt;
 	int ptid = -1;
 
-	kgsl_regread(device, MH_MMU_PAGE_FAULT, &reg);
-	kgsl_regread(device, MH_MMU_PT_BASE, &ptbase);
-
 	spin_lock(&kgsl_driver.ptlock);
 	list_for_each_entry(pt, &kgsl_driver.pagetable_list, list) {
-		if (ptbase == pt->base.gpuaddr) {
+		if (pt_base == pt->base.gpuaddr) {
 			ptid = (int) pt->name;
 			break;
 		}
 	}
 	spin_unlock(&kgsl_driver.ptlock);
 
+	return ptid;
+}
+
+void kgsl_mmu_pagefault(struct kgsl_device *device)
+{
+	unsigned int reg;
+	unsigned int ptbase;
+
+	kgsl_regread(device, MH_MMU_PAGE_FAULT, &reg);
+	kgsl_regread(device, MH_MMU_PT_BASE, &ptbase);
+
 	KGSL_MEM_CRIT(device,
 			"mmu page fault: page=0x%lx pt=%d op=%s axi=%d\n",
-			reg & ~(PAGE_SIZE - 1), ptid,
+			reg & ~(PAGE_SIZE - 1),
+			kgsl_get_ptname_from_ptbase(ptbase),
 			reg & 0x02 ? "WRITE" : "READ", (reg >> 4) & 0xF);
 }