KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turnip: fix segmentation fault in events 

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Jonathan Marek 2019-10-14 11:24:27 -04:00
parent 03772df450
commit eef195c9cc
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/freedreno/vulkan/tu_device.c
View File

@ -1732,9 +1732,23 @@ tu_CreateEvent(VkDevice _device,
if (!event)
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
VkResult result = tu_bo_init_new(device, &event->bo, 0x1000);
if (result != VK_SUCCESS)
goto fail_alloc;
result = tu_bo_map(device, &event->bo);
if (result != VK_SUCCESS)
goto fail_map;
*pEvent = tu_event_to_handle(event);
return VK_SUCCESS;
fail_map:
tu_bo_finish(device, &event->bo);
fail_alloc:
vk_free2(&device->alloc, pAllocator, event);
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
}
void
@ -1755,7 +1769,7 @@ tu_GetEventStatus(VkDevice _device, VkEvent _event)
{
TU_FROM_HANDLE(tu_event, event, _event);
if (*event->map == 1)
if (*(uint64_t*) event->bo.map == 1)
return VK_EVENT_SET;
return VK_EVENT_RESET;
}
@ -1764,7 +1778,7 @@ VkResult
tu_SetEvent(VkDevice _device, VkEvent _event)
{
TU_FROM_HANDLE(tu_event, event, _event);
*event->map = 1;
*(uint64_t*) event->bo.map = 1;
return VK_SUCCESS;
}
@ -1773,7 +1787,7 @@ VkResult
tu_ResetEvent(VkDevice _device, VkEvent _event)
{
TU_FROM_HANDLE(tu_event, event, _event);
*event->map = 0;
*(uint64_t*) event->bo.map = 0;
return VK_SUCCESS;
}

2
src/freedreno/vulkan/tu_private.h
View File

@ -981,7 +981,7 @@ tu_unaligned_dispatch(struct tu_cmd_buffer *cmd_buffer,
struct tu_event
{
uint64_t *map;
struct tu_bo bo;
};
struct tu_shader_module;