From 028591954a2d7e1c3cf8ecec04f1555564dd8076 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 6 Oct 2021 15:26:19 +1000
Subject: [PATCH] lvp/fence: quick fix to previous commit.

This fixes last of xcb cts issues.

Fixes: 8a294b6f975e1 ("lavapipe: Fix vkWaitForFences for initially-signalled fences")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13212>
---
 src/gallium/frontends/lavapipe/lvp_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index b82bb829476..f5805467399 100644
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -2089,7 +2089,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_WaitForFences(
          struct lvp_fence *f = lvp_fence_from_handle(pFences[i]);
 
          /* this is an unsubmitted fence: immediately bail out */
-         if (!f->timeline && !f->signalled)
+         if (!f->timeline && !f->signalled && !f->handle)
             return VK_TIMEOUT;
          if (!fence || f->timeline > fence->timeline)
             fence = f;