commit 4ebc87971f3e8a2448e390441f41732aabd0234b
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 22 12:15:19 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 22 12:15:18 2013 -0700
tree f27d65dc6700db1562a3e8ef31f6d46bc6eb4b29
parent c4b4f7dfbab9ba89633e0e6f6148aadab8fcf510
parent cd58719037634064a91476f1b7ff9ac291c88253

Merge "msm: kgsl: Save the last active context in snapshot"

drivers/gpu/msm/kgsl_snapshot.c

diff --git a/drivers/gpu/msm/kgsl_snapshot.c b/drivers/gpu/msm/kgsl_snapshot.c
index 42e79a0..a8e3492 100644
--- a/drivers/gpu/msm/kgsl_snapshot.c
+++ b/drivers/gpu/msm/kgsl_snapshot.c
@@ -169,8 +169,9 @@
 	header->grpclk = kgsl_get_clkrate(pwr->grp_clks[0]);
 	header->busclk = kgsl_get_clkrate(pwr->ebi1_clk);
 
-	/* Future proof for per-context timestamps */
-	header->current_context = -1;
+	/* Save the last active context */
+	kgsl_sharedmem_readl(&device->memstore, &header->current_context,
+		KGSL_MEMSTORE_OFFSET(KGSL_MEMSTORE_GLOBAL, current_context));
 
 	/* Get the current PT base */
 	header->ptbase = kgsl_mmu_get_current_ptbase(&device->mmu);