commit 8714496fd46add9c930486914bfdb6d3d83be80e
author Linux Build Service Account <lnxbuild@localhost> Tue Jan 15 04:09:58 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jan 15 04:09:58 2013 -0800
tree 76da4f6bfab0e1f819b291d2325c6152ef87295b
parent 3ef9e1031f1f11a25149726b9b8b19c173cbf374
parent 4e931c1d7deafa82957de21d7d929c3cdcc3cf3a

Merge "libgralloc: force 1M alignment for secure buffers"

libgralloc/gpu.cpp

diff --git a/libgralloc/gpu.cpp b/libgralloc/gpu.cpp
index f11a5fe..0d070f0 100644
--- a/libgralloc/gpu.cpp
+++ b/libgralloc/gpu.cpp
@@ -28,9 +28,12 @@
 #include "memalloc.h"
 #include "alloc_controller.h"
 #include <qdMetaData.h>
+#include "mdp_version.h"
 
 using namespace gralloc;
 
+#define SZ_1M 0x100000
+
 gpu_context_t::gpu_context_t(const private_module_t* module,
                              IAllocController* alloc_ctrl ) :
     mAllocCtrl(alloc_ctrl)
@@ -131,11 +134,18 @@
     data.offset = 0;
     data.fd = -1;
     data.base = 0;
-    data.size = size;
     if(format == HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED)
         data.align = 8192;
     else
         data.align = getpagesize();
+
+    /* force 1MB alignment selectively for secure buffers, MDP5 onwards */
+    if ((qdutils::MDPVersion::getInstance().getMDPVersion() >= \
+         qdutils::MDSS_V5) && (usage & GRALLOC_USAGE_PROTECTED)) {
+        data.align = ALIGN(data.align, SZ_1M);
+        size = ALIGN(size, data.align);
+    }
+    data.size = size;
     data.pHandle = (unsigned int) pHandle;
     err = mAllocCtrl->allocate(data, usage);