commit f8552390550d9e8acfd3e87c9a306733842b7aa7
author Rebecca Schultz Zavin <rebecca@android.com> Thu Sep 20 00:21:01 2012 -0700
committer Rebecca Schultz Zavin <rebecca@android.com> Thu Sep 20 14:39:18 2012 -0700
tree 3afd0b42c46a65f0d4aeb6de5d343c3f02868a0f
parent 6d6fbb7ee5b273fd957df1c2e0fae9f08bc360a5

Update gralloc to use new ion flag

Switches cached allocations from faulting in mappings, to
allocating them at mmap time.  Caches now have to be managed manually
from gralloc lock/unlock

Bug: 6854979
Change-Id: I2fa31719c70bb1ce836ca34c49cb34ab509ff1db
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

gralloc/gralloc.cpp

diff --git a/gralloc/gralloc.cpp b/gralloc/gralloc.cpp
index c212896..a9f40c5 100644
--- a/gralloc/gralloc.cpp
+++ b/gralloc/gralloc.cpp
@@ -309,7 +309,7 @@
         return -EINVAL;
 
     if( (usage & GRALLOC_USAGE_SW_READ_MASK) == GRALLOC_USAGE_SW_READ_OFTEN )
-        ion_flags = ION_FLAG_CACHED;
+        ion_flags = ION_FLAG_CACHED | ION_FLAG_CACHED_NEEDS_SYNC;
 
     private_module_t* m = reinterpret_cast<private_module_t*>
         (dev->common.module);

gralloc/mapper.cpp

diff --git a/gralloc/mapper.cpp b/gralloc/mapper.cpp
index eb82ed9..0e7b8b9 100644
--- a/gralloc/mapper.cpp
+++ b/gralloc/mapper.cpp
@@ -173,6 +173,12 @@
 {
     // we're done with a software buffer. nothing to do in this
     // implementation. typically this is used to flush the data cache.
+    private_handle_t* hnd = (private_handle_t*)handle;
+    ion_sync_fd(getIonFd(module), hnd->fd);
+    if (hnd->fd1 >= 0)
+        ion_sync_fd(getIonFd(module), hnd->fd1);
+    if (hnd->fd2 >= 0)
+        ion_sync_fd(getIonFd(module), hnd->fd2);
 
     if (private_handle_t::validate(handle) < 0)
         return -EINVAL;