Mesa (staging/22.1): venus: fix a bug on buffer cache init failure path

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: e4c8e591cc1560a4a02e07fdaa6f99755af9afbb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4c8e591cc1560a4a02e07fdaa6f99755af9afbb

Author: Yiwei Zhang <zzyiwei at chromium.org>
Date:   Sat May 21 22:28:54 2022 +0000

venus: fix a bug on buffer cache init failure path

The failure path was never hit though, and will not either.

Fixes: 65abd1d4aed ("venus: implement vn_buffer_cache_entries_create")

Signed-off-by: Yiwei Zhang <zzyiwei at chromium.org>
Reviewed-by: Chad Versace <chadversary at chromium.org>
Reviewed-by: Ryan Neph <ryanneph at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16731>
(cherry picked from commit 01a0bfc3f994834318814328978eff05d27ac5a8)

---

 .pick_status.json             | 2 +-
 src/virtio/vulkan/vn_buffer.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d10049d6057..23a3bf0408f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -562,7 +562,7 @@
         "description": "venus: fix a bug on buffer cache init failure path",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "65abd1d4aed48365f0054279616dc31a817b2be0"
     },
diff --git a/src/virtio/vulkan/vn_buffer.c b/src/virtio/vulkan/vn_buffer.c
index 8096a77e222..732df6805d3 100644
--- a/src/virtio/vulkan/vn_buffer.c
+++ b/src/virtio/vulkan/vn_buffer.c
@@ -92,8 +92,8 @@ vn_buffer_cache_entries_create(struct vn_device *dev,
       if (buf->requirements.memory.memoryRequirements.alignment <
           buf->requirements.memory.memoryRequirements.size) {
          vk_free(alloc, entries);
-         *out_entries = entries;
-         *out_entry_count = entry_count;
+         *out_entries = NULL;
+         *out_entry_count = 0;
          return VK_SUCCESS;
       }