commit 09483ffaaf6b88c0096c1e417cc9673962c89a7f
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 29 08:39:03 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 29 08:39:03 2013 -0700
tree e0dc7ce2494262fb119c5a08ce4c0aa863c5b5a8
parent 6838e776b7f67565e75e11e55ce24a164d3fa526
parent 6550fca7a2080b79595d44f32d18c7c060b18589

Merge "msm: kgsl: GPU pagefault policy change to not stall on pagefault"

drivers/gpu/msm/adreno.h

diff --git a/drivers/gpu/msm/adreno.h b/drivers/gpu/msm/adreno.h
index 26a6720..8f48440 100644
--- a/drivers/gpu/msm/adreno.h
+++ b/drivers/gpu/msm/adreno.h
@@ -383,8 +383,7 @@
 #define KGSL_FT_PAGEFAULT_GPUHALT_ENABLE     BIT(1)
 #define KGSL_FT_PAGEFAULT_LOG_ONE_PER_PAGE   BIT(2)
 #define KGSL_FT_PAGEFAULT_LOG_ONE_PER_INT    BIT(3)
-#define KGSL_FT_PAGEFAULT_DEFAULT_POLICY     (KGSL_FT_PAGEFAULT_INT_ENABLE + \
-					KGSL_FT_PAGEFAULT_GPUHALT_ENABLE)
+#define KGSL_FT_PAGEFAULT_DEFAULT_POLICY     KGSL_FT_PAGEFAULT_INT_ENABLE
 
 extern struct adreno_gpudev adreno_a2xx_gpudev;
 extern struct adreno_gpudev adreno_a3xx_gpudev;