commit 99f457806e2c6cec9eb23ef1b923b413a0f35b85
author Linux Build Service Account <lnxbuild@quicinc.com> Fri Sep 22 04:49:20 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 22 04:49:20 2017 -0700
tree 78355772a589d5e3a907490265db79b3cb980f38
parent 97ff0618a10b29b2cf6ac4847878473be80a2911
parent 0a06efde810311e4e5c791f9a3b5af0259b89201

Merge "msm: kgsl: Don't read stale crashdumper data"

drivers/gpu/msm/adreno_a5xx_snapshot.c

diff --git a/drivers/gpu/msm/adreno_a5xx_snapshot.c b/drivers/gpu/msm/adreno_a5xx_snapshot.c
index 78b56bc..6dc62866 100644
--- a/drivers/gpu/msm/adreno_a5xx_snapshot.c
+++ b/drivers/gpu/msm/adreno_a5xx_snapshot.c
@@ -767,6 +767,8 @@
 
 	crash_dump_valid = false;
 
+	if (!device->snapshot_crashdumper)
+		return;
 	if (capturescript.gpuaddr == 0 || registers.gpuaddr == 0)
 		return;
 
@@ -872,8 +874,7 @@
 		ARRAY_SIZE(a5xx_vbif_snapshot_registers));
 
 	/* Try to run the crash dumper */
-	if (device->snapshot_crashdumper)
-		_a5xx_do_crashdump(device);
+	_a5xx_do_crashdump(device);
 
 	kgsl_snapshot_add_section(device, KGSL_SNAPSHOT_SECTION_REGS,
 		snapshot, a5xx_snapshot_registers, NULL);

drivers/gpu/msm/adreno_a6xx_snapshot.c

diff --git a/drivers/gpu/msm/adreno_a6xx_snapshot.c b/drivers/gpu/msm/adreno_a6xx_snapshot.c
index f63e824d..32c8085 100644
--- a/drivers/gpu/msm/adreno_a6xx_snapshot.c
+++ b/drivers/gpu/msm/adreno_a6xx_snapshot.c
@@ -1527,6 +1527,8 @@
 
 	crash_dump_valid = false;
 
+	if (!device->snapshot_crashdumper)
+		return;
 	if (a6xx_capturescript.gpuaddr == 0 ||
 		a6xx_crashdump_registers.gpuaddr == 0)
 		return;