commit f389606af78f0a8a32c32d9f4a0124afbc1d6a1f
author Sushmita Susheelendra <ssusheel@codeaurora.org> Fri Aug 12 16:33:10 2011 -0600
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:17:07 2011 -0700
tree 3e32e639fb453aabce20cb418198ae86498ed171
parent 0a8ad170516c9610d2c2781839ab97c6ec79fb04

msm: kgsl: Record missing memory writes to the cff dump

The buffers memstore and dummyspace were being memset
before memory for them was allocated and mapped.
kgsl_cff_parse_ibs should record the write instead
of returning upon encoutering a hostaddr with no
physical addr.
Writes to GMEM were not being recorded. Adding
the mem syncs for that

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

drivers/gpu/msm/adreno.c

diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 40c87e9..2b39372 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -534,6 +534,8 @@
 	else
 		adreno_regwrite(device, REG_RBBM_PM_OVERRIDE2, 0x80);
 
+	kgsl_sharedmem_set(&device->memstore, 0, 0, device->memstore.size);
+
 	kgsl_sharedmem_writel(&device->memstore,
 			      KGSL_DEVICE_MEMSTORE_OFFSET(ref_wait_ts),
 			      init_reftimestamp);

drivers/gpu/msm/adreno_a2xx.c

diff --git a/drivers/gpu/msm/adreno_a2xx.c b/drivers/gpu/msm/adreno_a2xx.c
index f8ae18a..63bd7f0 100644
--- a/drivers/gpu/msm/adreno_a2xx.c
+++ b/drivers/gpu/msm/adreno_a2xx.c
@@ -1223,6 +1223,9 @@
 	kgsl_cache_range_op(&drawctxt->gpustate,
 			    KGSL_CACHE_OP_FLUSH);
 
+	kgsl_cffdump_syncmem(NULL, &drawctxt->gpustate,
+			drawctxt->gpustate.gpuaddr,
+			drawctxt->gpustate.size, false);
 	return 0;
 }
 
@@ -1271,6 +1274,11 @@
 	kgsl_cache_range_op(&drawctxt->context_gmem_shadow.gmemshadow,
 			    KGSL_CACHE_OP_FLUSH);
 
+	kgsl_cffdump_syncmem(NULL,
+			&drawctxt->context_gmem_shadow.gmemshadow,
+			drawctxt->context_gmem_shadow.gmemshadow.gpuaddr,
+			drawctxt->context_gmem_shadow.gmemshadow.size, false);
+
 	return 0;
 }
 

drivers/gpu/msm/kgsl.c

diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index ce3717e..6efab17 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -1926,8 +1926,6 @@
 	if (ret != 0)
 		goto err_close_mmu;
 
-	kgsl_sharedmem_set(&device->memstore, 0, 0, device->memstore.size);
-
 	wake_lock_init(&device->idle_wakelock, WAKE_LOCK_IDLE, device->name);
 	pm_qos_add_request(&device->pm_qos_req_dma, PM_QOS_CPU_DMA_LATENCY,
 				PM_QOS_DEFAULT_VALUE);

drivers/gpu/msm/kgsl_cffdump.c

diff --git a/drivers/gpu/msm/kgsl_cffdump.c b/drivers/gpu/msm/kgsl_cffdump.c
index 2cb2351..d419592 100644
--- a/drivers/gpu/msm/kgsl_cffdump.c
+++ b/drivers/gpu/msm/kgsl_cffdump.c
@@ -610,7 +610,6 @@
 
 	if (!memdesc->physaddr) {
 		KGSL_CORE_ERR("no physaddr");
-		return true;
 	} else {
 		mb();
 		kgsl_cache_range_op((struct kgsl_memdesc *)memdesc,

drivers/gpu/msm/kgsl_mmu.c

diff --git a/drivers/gpu/msm/kgsl_mmu.c b/drivers/gpu/msm/kgsl_mmu.c
index d588ff1..7471342 100644
--- a/drivers/gpu/msm/kgsl_mmu.c
+++ b/drivers/gpu/msm/kgsl_mmu.c
@@ -846,9 +846,6 @@
 		 * cannot be mapped by the MMU
 		 */
 		status = kgsl_allocate_contiguous(&mmu->dummyspace, 64);
-		if (!status)
-			kgsl_sharedmem_set(&mmu->dummyspace, 0, 0,
-					   mmu->dummyspace.size);
 	}
 
 	return status;