From 495b718b3f5ac1a97ce97131b6887af360d81724 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Tue, 5 Mar 2024 10:01:00 +0100 Subject: [PATCH] panvk: Rework the NULL test in panvk_buffer_{gpu_ptr,range}() We are about to allow buffer memory allocation from the cmd_buffer memory pool. In order to allow that, we need to tweak the NULL checks done in panvk_buffer_{gpu_ptr,range}() to use the device address instead of the bo field. Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/vulkan/panvk_buffer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panfrost/vulkan/panvk_buffer.h b/src/panfrost/vulkan/panvk_buffer.h index 741b31de64b..7362e9b5df3 100644 --- a/src/panfrost/vulkan/panvk_buffer.h +++ b/src/panfrost/vulkan/panvk_buffer.h @@ -38,7 +38,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_buffer, vk.base, VkBuffer, static inline uint64_t panvk_buffer_gpu_ptr(const struct panvk_buffer *buffer, uint64_t offset) { - if (buffer->bo == NULL) + if (!buffer->dev_addr) return 0; return buffer->dev_addr + offset; @@ -48,7 +48,7 @@ static inline uint64_t panvk_buffer_range(const struct panvk_buffer *buffer, uint64_t offset, uint64_t range) { - if (buffer->bo == NULL) + if (!buffer->dev_addr) return 0; return vk_buffer_range(&buffer->vk, offset, range);