mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

venus: drop the workaround for excessive dma-buf import oom on turnip 

This reverts commit fdc21a95aa.

No longer needed per prior commit.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29173>
This commit is contained in:
Yiwei Zhang 2024-05-07 20:28:41 +00:00 committed by Marge Bot
parent a1392394ba
commit 758b639d1b
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/virtio/vulkan/vn_device_memory.c
View File

@ -30,15 +30,7 @@ vn_device_memory_alloc_simple(struct vn_device *dev,
{
VkDevice dev_handle = vn_device_to_handle(dev);
VkDeviceMemory mem_handle = vn_device_memory_to_handle(mem);
/* Workaround dEQP-VK.wsi.android.swapchain.simulate_oom.* test failures on
* turnip where excessive imports can fail, and venus has to propagate oom.
*/
const bool force_sync =
mem->base.base.import_handle_type ==
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT &&
dev->physical_device->renderer_driver_id == VK_DRIVER_ID_MESA_TURNIP;
if (VN_PERF(NO_ASYNC_MEM_ALLOC) || force_sync) {
if (VN_PERF(NO_ASYNC_MEM_ALLOC)) {
return vn_call_vkAllocateMemory(dev->primary_ring, dev_handle,
alloc_info, NULL, &mem_handle);
}