From ac61d6d0c09eee0260ff0439407a66493cbc4b9f Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Mon, 11 Mar 2024 12:00:20 +0100
Subject: [PATCH] panvk: Do not handle invalid NULL memory object in
 BindImageMemory2()

VkDeviceMemory objects passed to BindImageMemory2() are not allowed to
bu VK_NULL_HANDLE, so let's drop the if (mem) test and assert()
instead.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28104>
---
 src/panfrost/vulkan/panvk_device.c | 48 ++++++++++++++----------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c
index d810212f165..e14bdd7b7d1 100644
--- a/src/panfrost/vulkan/panvk_device.c
+++ b/src/panfrost/vulkan/panvk_device.c
@@ -1498,36 +1498,32 @@ panvk_BindImageMemory2(VkDevice device, uint32_t bindInfoCount,
       VK_FROM_HANDLE(panvk_device_memory, mem, pBindInfos[i].memory);
       struct pan_kmod_bo *old_bo = image->bo;
 
-      if (mem) {
-         image->bo = pan_kmod_bo_get(mem->bo);
-         image->pimage.data.base = mem->addr.dev;
-         image->pimage.data.offset = pBindInfos[i].memoryOffset;
-         /* Reset the AFBC headers */
-         if (drm_is_afbc(image->pimage.layout.modifier)) {
-            /* Transient CPU mapping */
-            void *base = pan_kmod_bo_mmap(mem->bo, 0, pan_kmod_bo_size(mem->bo),
-                                          PROT_WRITE, MAP_SHARED, NULL);
+      assert(mem);
+      image->bo = pan_kmod_bo_get(mem->bo);
+      image->pimage.data.base = mem->addr.dev;
+      image->pimage.data.offset = pBindInfos[i].memoryOffset;
+      /* Reset the AFBC headers */
+      if (drm_is_afbc(image->pimage.layout.modifier)) {
+         /* Transient CPU mapping */
+         void *base = pan_kmod_bo_mmap(mem->bo, 0, pan_kmod_bo_size(mem->bo),
+                                       PROT_WRITE, MAP_SHARED, NULL);
 
-            assert(base != MAP_FAILED);
+         assert(base != MAP_FAILED);
 
-            for (unsigned layer = 0; layer < image->pimage.layout.array_size;
-                 layer++) {
-               for (unsigned level = 0; level < image->pimage.layout.nr_slices;
-                    level++) {
-                  void *header = base + image->pimage.data.offset +
-                                 (layer * image->pimage.layout.array_stride) +
-                                 image->pimage.layout.slices[level].offset;
-                  memset(header, 0,
-                         image->pimage.layout.slices[level].afbc.header_size);
-               }
+         for (unsigned layer = 0; layer < image->pimage.layout.array_size;
+              layer++) {
+            for (unsigned level = 0; level < image->pimage.layout.nr_slices;
+                 level++) {
+               void *header = base + image->pimage.data.offset +
+                              (layer * image->pimage.layout.array_stride) +
+                              image->pimage.layout.slices[level].offset;
+               memset(header, 0,
+                      image->pimage.layout.slices[level].afbc.header_size);
             }
-
-            ASSERTED int ret = os_munmap(base, pan_kmod_bo_size(mem->bo));
-            assert(!ret);
          }
-      } else {
-         image->bo = NULL;
-         image->pimage.data.offset = pBindInfos[i].memoryOffset;
+
+         ASSERTED int ret = os_munmap(base, pan_kmod_bo_size(mem->bo));
+         assert(!ret);
       }
 
       pan_kmod_bo_put(old_bo);