Mesa (staging/19.2): anv: Don't leak when set_tiling fails

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: 9925871a1a798e30d77e703d2550bed127a4bf97
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9925871a1a798e30d77e703d2550bed127a4bf97

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Mon Dec  2 13:51:59 2019 -0600

anv: Don't leak when set_tiling fails

Fixes: a44744e01d73 "anv: Require a dedicated allocation for..."
Reviewed-by: Ivan Briano <ivan.briano at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
(cherry picked from commit 0a36fafa95175efbad1a61b36706e535929afd2b)
Conflicts resolved by Dylan Baker

Conflicts:
	src/intel/vulkan/anv_device.c

---

 src/intel/vulkan/anv_device.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index e9c96108582..90019f2b14a 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -3098,9 +3098,10 @@ VkResult anv_AllocateMemory(
                                       i915_tiling);
          if (ret) {
             anv_bo_cache_release(device, &device->bo_cache, mem->bo);
-            return vk_errorf(device->instance, NULL,
-                             VK_ERROR_OUT_OF_DEVICE_MEMORY,
-                             "failed to set BO tiling: %m");
+            result = vk_errorf(device->instance, NULL,
+                               VK_ERROR_OUT_OF_DEVICE_MEMORY,
+                               "failed to set BO tiling: %m");
+            goto fail;
          }
       }
    }