commit 42b56108688c788d6a36d2dd2724f051ad16c39e
author Lingfeng Yang <lfy@google.com> Thu Mar 28 01:15:17 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 28 01:15:17 2019 +0000
tree 84f784db91ace06a9c9e96a180d6f0d26ec8bfef
parent 047d270064502e0764e9955c329a2ba136b20b84
parent c53e74785ef5473d0bdbc0cfc144fc1d070c846f

Merge "[vulkan] deferred command buffers (guest)"

shared/OpenglCodecCommon/gralloc_cb.h

diff --git a/shared/OpenglCodecCommon/gralloc_cb.h b/shared/OpenglCodecCommon/gralloc_cb.h
index f874c12..979d8e5 100644
--- a/shared/OpenglCodecCommon/gralloc_cb.h
+++ b/shared/OpenglCodecCommon/gralloc_cb.h
@@ -21,7 +21,6 @@
 #include <hardware/gralloc.h>
 #include <cutils/native_handle.h>
 
-#include "goldfish_dma.h"
 #include "qemu_pipe.h"
 
 #define BUFFER_HANDLE_MAGIC ((int)0xabfabfab)
@@ -64,7 +63,6 @@
         hostHandle(0),
         emuFrameworkFormat(p_emuFrameworkFormat)
     {
-        goldfish_dma.fd = -1;
         refcount_pipe_fd = QEMU_PIPE_INVALID_HANDLE;
         version = sizeof(native_handle);
         numFds = 0;
@@ -134,7 +132,6 @@
     int lockedHeight;
     uint32_t hostHandle;
 
-    goldfish_dma_context goldfish_dma;
     uint32_t goldfish_dma_buf_size;
     EmulatorFrameworkFormat emuFrameworkFormat;
 };

system/gralloc/gralloc.cpp

diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index 812ee04..57a9e9e 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -709,19 +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();
-        } else {
-            cb->goldfish_dma.fd = -1;
-        }
-        hostCon->unlock();
-    } else {
-        cb->goldfish_dma.fd = -1;
     }
 
     if (needHostCb) {
@@ -780,6 +767,14 @@
         *pStride = stride;
         break;
     }
+
+    hostCon->lock();
+    if (rcEnc->getDmaVersion() > 0) {
+        init_gralloc_dmaregion();
+        get_gralloc_dmaregion();
+    }
+    hostCon->unlock();
+
     return 0;
 }