commit f76b5e960ecf5db54a7a18d89890f7f302e60b07
author Linux Build Service Account <lnxbuild@localhost> Mon Sep 24 21:37:16 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 24 21:37:07 2012 -0700
tree 851f7a2f4c18d6e94571555dccc2e6a2d3b7774f
parent 963721084130edfddd90f6d23a4cffbc99619e5b
parent 7a95ad0c1da76e0e33a4e3e6091ea40503f6ab2e

Merge "msm: kgsl: In kgsl release do not idle if device is in HUNG state"

drivers/gpu/msm/adreno_drawctxt.c

diff --git a/drivers/gpu/msm/adreno_drawctxt.c b/drivers/gpu/msm/adreno_drawctxt.c
index 70ad81c..7cbc7a8 100644
--- a/drivers/gpu/msm/adreno_drawctxt.c
+++ b/drivers/gpu/msm/adreno_drawctxt.c
@@ -226,7 +226,8 @@
 		adreno_drawctxt_switch(adreno_dev, NULL, 0);
 	}
 
-	adreno_idle(device);
+	if (device->state != KGSL_STATE_HUNG)
+		adreno_idle(device);
 
 	kgsl_sharedmem_free(&drawctxt->gpustate);
 	kgsl_sharedmem_free(&drawctxt->context_gmem_shadow.gmemshadow);