summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nouveau
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2015-06-26 13:13:16 +0200
committerMarek Olšák <[email protected]>2015-07-05 15:08:58 +0200
commit3da1c7919d0dffee3887f390fcf29893016e3043 (patch)
tree154477ca532ad5729a4b7459a5daf5729a17a65f /src/gallium/drivers/nouveau
parentd50598fbad16bfb2b46800b664d382f42af64db0 (diff)
gallium: handle fence_finish timeout in various drivers
I copied what fence_signalled does. Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau')
-rw-r--r--src/gallium/drivers/nouveau/nouveau_screen.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index c6e5074db19..9f77db082ea 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -79,6 +79,9 @@ nouveau_screen_fence_finish(struct pipe_screen *screen,
struct pipe_fence_handle *pfence,
uint64_t timeout)
{
+ if (!timeout)
+ return nouveau_fence_signalled(nouveau_fence(pfence));
+
return nouveau_fence_wait(nouveau_fence(pfence));
}