commit 8f664bcb2c0f4f12c14f73bc1db2285245511be1
author Roman Kiryanov <rkir@google.com> Wed Jul 03 14:03:17 2019 -0700
committer Roman Kiryanov <rkir@google.com> Wed Jul 03 15:36:39 2019 -0700
tree d1640a97a08be61749077411891a7d6da972e97f
parent 049133568348fe1b4181cdf460118899dde86c67

Init the DMA buffer in gralloc_lock

gralloc_unlock copies pixels into the DMA buffer
if it is enabled, but it was allocated without
a prior call to gralloc_register_buffer.

Bug: 128324105
Test: emugl_combined_unittests
Change-Id: I6105529b4938c8ab8c9bd9a66a1f837aabd3ac96
Signed-off-by: Roman Kiryanov <rkir@google.com>

system/gralloc/gralloc.cpp

diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index 725848e..ee83b15 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -1025,13 +1025,6 @@
             int32_t* openCountPtr = getOpenCountPtr(cb);
             if (!*openCountPtr) *openCountPtr = 1;
         }
-
-        hostCon->lock();
-        if (rcEnc->getDmaVersion() > 0) {
-            gralloc_dmaregion_register_ashmem(rcEnc, cb->ashmemSize);
-        }
-        hostCon->unlock();
-
     }
 
     if (cb->ashmemSize > 0) {
@@ -1226,6 +1219,10 @@
                 delete [] tmpBuf;
             }
         }
+
+        if (rcEnc->getDmaVersion() > 0) {
+            gralloc_dmaregion_register_ashmem(rcEnc, cb->ashmemSize);
+        }
         hostCon->unlock();
     }