From 02c65181c159ad3f86c8045bc8093a3d4f2b4486 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Mon, 16 Jun 2025 01:02:34 -0700
Subject: [PATCH] hasvk: free up hwvulkan_device_t upon driver unloading

Per <hardware/hwvulkan.h>, the hw_device_t::close() function is called
upon driver unloading. The behavior has been like this since Android 10.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35561>
---
 src/intel/vulkan_hasvk/anv_android.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan_hasvk/anv_android.c b/src/intel/vulkan_hasvk/anv_android.c
index a89e796e6cd..cd47956323f 100644
--- a/src/intel/vulkan_hasvk/anv_android.c
+++ b/src/intel/vulkan_hasvk/anv_android.c
@@ -96,8 +96,13 @@ anv_hal_open(const struct hw_module_t* mod, const char* id,
 static int
 anv_hal_close(struct hw_device_t *dev)
 {
-   /* hwvulkan.h claims that hw_device_t::close() is never called. */
-   return -1;
+   /* the hw_device_t::close() function is called upon driver unloading */
+   assert(dev->version == HWVULKAN_DEVICE_API_VERSION_0_1);
+   assert(dev->module == &HAL_MODULE_INFO_SYM.common);
+
+   hwvulkan_device_t *hal_dev = container_of(dev, hwvulkan_device_t, common);
+   free(hal_dev);
+   return 0;
 }
 
 #if ANDROID_API_LEVEL >= 26