hk: fix buffer binding

clamp sizes to avoid kernel complaints, and check the return.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33682>
This commit is contained in:
Alyssa Rosenzweig
2025-01-29 11:51:34 -05:00
committed by Marge Bot
parent 1114fbcdb7
commit f50edbd696

View File

@@ -239,9 +239,13 @@ hk_BindBufferMemory2(VkDevice device, uint32_t bindInfoCount,
if (buffer->va) {
VK_FROM_HANDLE(hk_device, dev, device);
dev->dev.ops.bo_bind(&dev->dev, mem->bo, buffer->addr,
buffer->va->size_B, pBindInfos[i].memoryOffset,
ASAHI_BIND_READ | ASAHI_BIND_WRITE, false);
size_t size = MIN2(mem->bo->size, buffer->va->size_B);
int ret = dev->dev.ops.bo_bind(
&dev->dev, mem->bo, buffer->addr, size, pBindInfos[i].memoryOffset,
ASAHI_BIND_READ | ASAHI_BIND_WRITE, false);
if (ret)
return VK_ERROR_UNKNOWN;
} else {
buffer->addr = mem->bo->va->addr + pBindInfos[i].memoryOffset;
}