commit c573155e3d5f07f019032cf0d0419cb68dfd59fa
author Roman Kiryanov <rkir@google.com> Wed Oct 09 14:20:21 2019 -0700
committer Roman Kiryanov <rkir@google.com> Wed Oct 09 14:40:09 2019 -0700
tree 81efc868d2dfb4d6a90592d9ac6f37e786ab6222
parent 1b830a4423e32627cfc34c776a0c225aaa1436b5

Use memory in the DMA context directly instead of via GoldfishAddressSpaceBlock

gralloc passes buffer handles between processes as a sequence of bytes,
we cannot pass instances of GoldfishAddressSpaceBlock this way.

In grallocs prior to gralloc30 (to be introduced) we passed ashmem
buffers between processes, gralloc30 will use only GoldfishAddressSpaceBlock
buffers.

Bug: 141385612
Test: build, boot
Change-Id: Ia817ef97cb8348be62af90d33a928fbf15336d84
Signed-off-by: Roman Kiryanov <rkir@google.com>

system/OpenglSystemCommon/HostConnection.h

diff --git a/system/OpenglSystemCommon/HostConnection.h b/system/OpenglSystemCommon/HostConnection.h
index df111fd..a6424ab 100644
--- a/system/OpenglSystemCommon/HostConnection.h
+++ b/system/OpenglSystemCommon/HostConnection.h
@@ -21,7 +21,6 @@
 #include "renderControl_enc.h"
 #include "ChecksumCalculator.h"
 #include "goldfish_dma.h"
-#include "goldfish_address_space.h"
 
 #include <cutils/native_handle.h>
 
@@ -48,7 +47,7 @@
 public:
     ExtendedRCEncoderContext(IOStream *stream, ChecksumCalculator *checksumCalculator)
         : renderControl_encoder_context_t(stream, checksumCalculator),
-          m_dmaCxt(NULL), m_addressSpaceBlock(NULL) { }
+          m_dmaCxt(NULL), m_dmaPtr(NULL), m_dmaPhysAddr(0) { }
     void setSyncImpl(SyncImpl syncImpl) { m_featureInfo.syncImpl = syncImpl; }
     void setDmaImpl(DmaImpl dmaImpl) { m_featureInfo.dmaImpl = dmaImpl; }
     void setHostComposition(HostComposition hostComposition) {
@@ -65,12 +64,14 @@
         return m_featureInfo.hasYUVCache; }
     DmaImpl getDmaVersion() const { return m_featureInfo.dmaImpl; }
     void bindDmaContext(struct goldfish_dma_context* cxt) { m_dmaCxt = cxt; }
-    void bindAddressSpaceBlock(GoldfishAddressSpaceBlock* block) {
-        m_addressSpaceBlock = block;
+    void bindDmaDirectly(void* dmaPtr, uint64_t dmaPhysAddr) {
+        m_dmaPtr = dmaPtr;
+        m_dmaPhysAddr = dmaPhysAddr;
     }
     virtual uint64_t lockAndWriteDma(void* data, uint32_t size) {
-        if (m_addressSpaceBlock) {
-            return writeAddressSpaceBlock(data, size, m_addressSpaceBlock);
+        if (m_dmaPtr && m_dmaPhysAddr) {
+            memcpy(m_dmaPtr, data, size);
+            return m_dmaPhysAddr;
         } else if (m_dmaCxt) {
             return writeGoldfishDma(data, size, m_dmaCxt);
         } else {
@@ -103,20 +104,10 @@
         return paddr;
     }
 
-    static uint64_t writeAddressSpaceBlock(void* data, uint32_t size,
-                                           GoldfishAddressSpaceBlock* block) {
-        ALOGV("%s(data=%p, size=%u): call", __func__, data, size);
-
-        memcpy(block->guestPtr(), data, size);
-        const uint64_t paddr = block->physAddr();
-
-        ALOGV("%s: paddr=0x%llx", __func__, (unsigned long long)paddr);
-        return paddr;
-    }
-
     EmulatorFeatureInfo m_featureInfo;
     struct goldfish_dma_context* m_dmaCxt;
-    GoldfishAddressSpaceBlock* m_addressSpaceBlock;
+    void* m_dmaPtr;
+    uint64_t m_dmaPhysAddr;
 };
 
 // Abstraction for gralloc handle conversion

system/gralloc/gralloc_old.cpp

diff --git a/system/gralloc/gralloc_old.cpp b/system/gralloc/gralloc_old.cpp
index 032efa8..2880391 100644
--- a/system/gralloc/gralloc_old.cpp
+++ b/system/gralloc/gralloc_old.cpp
@@ -465,7 +465,8 @@
         }
 
         if (grdma->address_space_block.guestPtr()) {
-            rcEnc->bindAddressSpaceBlock(&grdma->address_space_block);
+            rcEnc->bindDmaDirectly(grdma->address_space_block.guestPtr(),
+                                   grdma->address_space_block.physAddr());
         } else if (grdma->goldfish_dma.mapped_addr) {
             rcEnc->bindDmaContext(&grdma->goldfish_dma);
         } else {