OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: lock screen queue on context_destroy and CreateSwapchain

Browse Source 
Cc: mesa-stable
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25985>
This commit is contained in:
Karol Herbst
2023-11-01 00:59:55 +01:00
committed by Marge Bot
parent 3bff59c567
commit 208875516c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/zink/zink_context.c
View File

@@ -125,7 +125,9 @@ zink_context_destroy(struct pipe_context *pctx)
if (util_queue_is_initialized(&screen->flush_queue)) if (util_queue_is_initialized(&screen->flush_queue))
util_queue_finish(&screen->flush_queue); util_queue_finish(&screen->flush_queue);
if (ctx->batch.state && !screen->device_lost) { if (ctx->batch.state && !screen->device_lost) {
simple_mtx_lock(&screen->queue_lock);
VkResult result = VKSCR(QueueWaitIdle)(screen->queue); VkResult result = VKSCR(QueueWaitIdle)(screen->queue);
simple_mtx_unlock(&screen->queue_lock);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
mesa_loge("ZINK: vkQueueWaitIdle failed (%s)", vk_Result_to_str(result)); mesa_loge("ZINK: vkQueueWaitIdle failed (%s)", vk_Result_to_str(result));

2
src/gallium/drivers/zink/zink_kopper.c
View File

@@ -318,7 +318,9 @@ kopper_CreateSwapchain(struct zink_screen *screen, struct kopper_displaytarget *
if (error == VK_ERROR_NATIVE_WINDOW_IN_USE_KHR) { if (error == VK_ERROR_NATIVE_WINDOW_IN_USE_KHR) {
if (util_queue_is_initialized(&screen->flush_queue)) if (util_queue_is_initialized(&screen->flush_queue))
util_queue_finish(&screen->flush_queue); util_queue_finish(&screen->flush_queue);
simple_mtx_lock(&screen->queue_lock);
VkResult result = VKSCR(QueueWaitIdle)(screen->queue); VkResult result = VKSCR(QueueWaitIdle)(screen->queue);
simple_mtx_unlock(&screen->queue_lock);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
mesa_loge("ZINK: vkQueueWaitIdle failed (%s)", vk_Result_to_str(result)); mesa_loge("ZINK: vkQueueWaitIdle failed (%s)", vk_Result_to_str(result));
error = VKSCR(CreateSwapchainKHR)(screen->dev, &cswap->scci, NULL, error = VKSCR(CreateSwapchainKHR)(screen->dev, &cswap->scci, NULL,