commit c93bfa7961bcdd6ccbceb7a96c1535aa36e834c0
author Roman Kiryanov <rkir@google.com> Wed Mar 27 17:22:53 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 27 17:22:53 2019 -0700
tree 89e535433f77a62beec8acb4912a8d2eb75246c6
parent 045c61894c4553c761448f84a7ab6495f7efd84d
parent 959d5e35bae7871965959c854e57dcfa1d0e04bb

Increment the DMA counter if gralloc_alloc completes successfully am: 047d270064
am: 959d5e35ba

Change-Id: Id29ce93ca2bdb698af3b85c1294a3d9fbed93755

system/gralloc/gralloc.cpp

diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index ff2c744..57a9e9e 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -709,15 +709,6 @@
         }
 
         cb->setFd(fd);
-
-        hostCon->lock();
-
-        if (rcEnc->getDmaVersion() > 0) {
-            D("%s: creating goldfish dma region of size %lu (cb fd %d)\n", __FUNCTION__, ashmem_size, cb->fd);
-            init_gralloc_dmaregion();
-            get_gralloc_dmaregion();
-        }
-        hostCon->unlock();
     }
 
     if (needHostCb) {
@@ -776,6 +767,14 @@
         *pStride = stride;
         break;
     }
+
+    hostCon->lock();
+    if (rcEnc->getDmaVersion() > 0) {
+        init_gralloc_dmaregion();
+        get_gralloc_dmaregion();
+    }
+    hostCon->unlock();
+
     return 0;
 }