From a3fb990a866bc3cb7eac44804ef94bb8691ed6e2 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Mon, 29 Apr 2024 09:20:08 +0200 Subject: [PATCH] panvk: Kill panvk_queue_get_device() We use to_panvk_device() elsewhere. Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Acked-by: Erik Faye-Lund Part-of: --- src/panfrost/vulkan/panvk_queue.h | 10 +++------- src/panfrost/vulkan/panvk_vX_queue.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/panfrost/vulkan/panvk_queue.h b/src/panfrost/vulkan/panvk_queue.h index fc4b8a130db..b9e2272a487 100644 --- a/src/panfrost/vulkan/panvk_queue.h +++ b/src/panfrost/vulkan/panvk_queue.h @@ -12,6 +12,8 @@ #include +#include "panvk_device.h" + #include "vk_queue.h" struct panvk_queue { @@ -21,16 +23,10 @@ struct panvk_queue { VK_DEFINE_HANDLE_CASTS(panvk_queue, vk.base, VkQueue, VK_OBJECT_TYPE_QUEUE) -static inline struct panvk_device * -panvk_queue_get_device(const struct panvk_queue *queue) -{ - return container_of(queue->vk.base.device, struct panvk_device, vk); -} - static inline void panvk_queue_finish(struct panvk_queue *queue) { - struct panvk_device *dev = panvk_queue_get_device(queue); + struct panvk_device *dev = to_panvk_device(queue->vk.base.device); vk_queue_finish(&queue->vk); drmSyncobjDestroy(dev->vk.drm_fd, queue->sync); diff --git a/src/panfrost/vulkan/panvk_vX_queue.c b/src/panfrost/vulkan/panvk_vX_queue.c index ddcfd468b0b..f93bcea779c 100644 --- a/src/panfrost/vulkan/panvk_vX_queue.c +++ b/src/panfrost/vulkan/panvk_vX_queue.c @@ -326,7 +326,7 @@ VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(QueueWaitIdle)(VkQueue _queue) { VK_FROM_HANDLE(panvk_queue, queue, _queue); - struct panvk_device *dev = panvk_queue_get_device(queue); + struct panvk_device *dev = to_panvk_device(queue->vk.base.device); if (vk_device_is_lost(&dev->vk)) return VK_ERROR_DEVICE_LOST;