venus: further cleanup vn_relax_init to take instance instead of ring

For multi-ring, later we can just check primary ring alive status.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26179>
This commit is contained in:
Yiwei Zhang
2023-11-06 12:46:42 -08:00
committed by Marge Bot
parent f6adc60822
commit 70e8d1397e
4 changed files with 18 additions and 17 deletions
+4 -4
View File
@@ -1786,7 +1786,7 @@ vn_WaitForFences(VkDevice device,
memcpy(fences, pFences, sizeof(*fences) * fenceCount);
struct vn_relax_state relax_state =
vn_relax_init(&dev->instance->ring.ring, "client");
vn_relax_init(dev->instance, "client");
while (result == VK_NOT_READY) {
result = vn_remove_signaled_fences(device, fences, &fenceCount);
result =
@@ -1798,7 +1798,7 @@ vn_WaitForFences(VkDevice device,
vk_free(alloc, fences);
} else {
struct vn_relax_state relax_state =
vn_relax_init(&dev->instance->ring.ring, "client");
vn_relax_init(dev->instance, "client");
while (result == VK_NOT_READY) {
result = vn_find_first_signaled_fence(device, pFences, fenceCount);
result =
@@ -2301,7 +2301,7 @@ vn_WaitSemaphores(VkDevice device,
memcpy(values, pWaitInfo->pValues, sizeof(*values) * semaphore_count);
struct vn_relax_state relax_state =
vn_relax_init(&dev->instance->ring.ring, "client");
vn_relax_init(dev->instance, "client");
while (result == VK_NOT_READY) {
result = vn_remove_signaled_semaphores(device, semaphores, values,
&semaphore_count);
@@ -2314,7 +2314,7 @@ vn_WaitSemaphores(VkDevice device,
vk_free(alloc, semaphores);
} else {
struct vn_relax_state relax_state =
vn_relax_init(&dev->instance->ring.ring, "client");
vn_relax_init(dev->instance, "client");
while (result == VK_NOT_READY) {
result = vn_find_first_signaled_semaphore(
device, pWaitInfo->pSemaphores, pWaitInfo->pValues,