commit 701f8a602d62900ffbcb417dfeee95467a288d44
author Gurchetan Singh <gurchetansingh@chromium.org> Tue Apr 19 17:19:12 2022 -0700
committer Gurchetan Singh <gurchetansingh@google.com> Thu Jun 30 15:05:34 2022 -0700
tree 4867bd03c9c499ab0225719376e55e58e8b2de80
parent dd477f5d5f05009df550c056e481c1578458b381

vulkan-cereal: nuke stream_renderer_resource_create_v2

Use blob instead.

BUG=202552093
TEST=run ASG

Change-Id: I9e265203636108fc5050f2a58572e745789c8170

stream-servers/virtio-gpu-gfxstream-renderer.cpp

diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
index 36411ce..e3f435c 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
@@ -177,7 +177,7 @@
     VirtioGpuCtxId ctxId;
     uint64_t hva;
     uint64_t hvaSize;
-    uint64_t hvaId;
+    uint64_t blobId;
     uint32_t hvSlot;
     uint32_t caching;
 };
@@ -984,7 +984,7 @@
         e.hostPipe = 0;
         e.hva = 0;
         e.hvaSize = 0;
-        e.hvaId = 0;
+        e.blobId = 0;
         e.hvSlot = 0;
         allocResource(e, iov, num_iovs);
 
@@ -1029,21 +1029,9 @@
             entry.numIovs = 0;
         }
 
-        if (entry.hvaId) {
-            // gfxstream manages when to actually remove the hostmem id and storage
-            //
-            // fprintf(stderr, "%s: unref a hostmem resource. hostmem id: 0x%llx\n", __func__,
-            //         (unsigned long long)(entry.hvaId));
-            // HostmemIdMapping::get()->remove(entry.hvaId);
-            // auto ownedIt = mOwnedHostmemIdBuffers.find(entry.hvaId);
-            // if (ownedIt != mOwnedHostmemIdBuffers.end()) {
-            //      // android::aligned_buf_free(ownedIt->second);
-            // }
-        }
-
         entry.hva = 0;
         entry.hvaSize = 0;
-        entry.hvaId = 0;
+        entry.blobId = 0;
         entry.hvSlot = 0;
 
         mResources.erase(it);
@@ -1387,26 +1375,22 @@
         }
     }
 
-    void createResourceV2(uint32_t res_handle, uint64_t hvaId) {
+    void createBlob(uint32_t ctx_id, uint32_t res_handle,
+                    const struct stream_renderer_create_blob* create_blob,
+                    const struct stream_renderer_handle* handle) {
+
         PipeResEntry e;
-        struct virgl_renderer_resource_create_args args = {
-            res_handle,
-            PIPE_BUFFER,
-            VIRGL_FORMAT_R8_UNORM,
-            PIPE_BIND_COMMAND_ARGS_BUFFER,
-            0, 1, 1,
-            0, 0, 0, 0
-        };
+        struct virgl_renderer_resource_create_args args = { 0 };
         e.args = args;
         e.hostPipe = 0;
 
-        auto entry = HostmemIdMapping::get()->get(hvaId);
+        auto entry = HostmemIdMapping::get()->get(create_blob->blob_id);
 
         e.hva = entry.hva;
         e.hvaSize = entry.size;
         e.args.width = entry.size;
         e.caching = entry.caching;
-        e.hvaId = hvaId;
+        e.blobId = create_blob->blob_id;
         e.hvSlot = 0;
         e.iov = nullptr;
         e.numIovs = 0;
@@ -1700,7 +1684,7 @@
                                           const struct stream_renderer_create_blob* create_blob,
                                           const struct iovec* iovecs, uint32_t num_iovs,
                                           const struct stream_renderer_handle* handle) {
-    sRenderer()->createResourceV2(res_handle, create_blob->blob_id);
+    sRenderer()->createBlob(ctx_id, res_handle, create_blob, handle);
     return 0;
 }