commit a38d62051bdd286b772989d5bb37d5d7b09a3e3c
author Linux Build Service Account <lnxbuild@localhost> Thu Jun 05 16:38:14 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jun 05 16:38:14 2014 -0700
tree 1b5b94a7a225d316601d84316aa5b9895bcfb709
parent f15c0b84595de225f62f23a49c1c47b7a28b439f
parent 95e16d4911d9b0289526d6f7868ec1b9b63c00ea

Merge "libgralloc: Set Alignment to 1M only for Secured buffers."

libgralloc/gpu.cpp

diff --git a/libgralloc/gpu.cpp b/libgralloc/gpu.cpp
index 0cba07a..78e875a 100644
--- a/libgralloc/gpu.cpp
+++ b/libgralloc/gpu.cpp
@@ -69,7 +69,8 @@
 
     /* force 1MB alignment selectively for secure buffers, MDP5 onwards */
 #ifdef MDSS_TARGET
-    if (usage & GRALLOC_USAGE_PROTECTED) {
+    if ((usage & GRALLOC_USAGE_PROTECTED) &&
+        (usage & GRALLOC_USAGE_PRIVATE_MM_HEAP)) {
         data.align = ALIGN((int) data.align, SZ_1M);
         size = ALIGN(size, data.align);
     }