commit 4796c32da60130483aeb120155e46ac8920be774
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 09 11:11:44 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 09 11:11:44 2013 -0700
tree 30a5c4a8a6365b5886e2202f850568066db21f1f
parent 96ebdbb3945a41a80974f74655fb287efaa6a4f9
parent 499ab3dfdfbd85faf88036bc14fc45c540609b24

Merge "gralloc: Do not map framebuffer memory unless needed"

libgralloc/framebuffer.cpp

diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp
index 3828680..1851196 100644
--- a/libgralloc/framebuffer.cpp
+++ b/libgralloc/framebuffer.cpp
@@ -336,9 +336,15 @@
 
 static int mapFrameBuffer(struct private_module_t* module)
 {
-    pthread_mutex_lock(&module->lock);
-    int err = mapFrameBufferLocked(module);
-    pthread_mutex_unlock(&module->lock);
+    int err = 0;
+    char property[PROPERTY_VALUE_MAX];
+    if((property_get("debug.gralloc.map_fb_memory", property, NULL) > 0) &&
+       (!strncmp(property, "1", PROPERTY_VALUE_MAX ) ||
+        (!strncasecmp(property,"true", PROPERTY_VALUE_MAX )))) {
+        pthread_mutex_lock(&module->lock);
+        err = mapFrameBufferLocked(module);
+        pthread_mutex_unlock(&module->lock);
+    }
     return err;
 }