summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2016-02-25 11:02:03 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-04-11 21:02:17 +0100
commit3afee5e82f5be51892db50a060afe651be5443f2 (patch)
tree3bbec8747cd826a05a41dcff8c911aa3959854b2
parent09d1434fd70110ab47a56f378b87cfc7ad8a732a (diff)
winsys/svga: Increase the fence timeout
If running with a software renderer backend, the timeout may be insufficient, and we don't want to release busy buffers too early. In practice, SVGA gpu lockups are extremely rare. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Brian Paul <brianp@vmware.com> Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 395c7b8fa17069fe996a63a8bca2bfd0fe3f16a0)
-rw-r--r--src/gallium/winsys/svga/drm/vmw_screen_ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
index c86d95a14fe..7fc93e74812 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
@@ -52,6 +52,7 @@
#include <unistd.h>
#define VMW_MAX_DEFAULT_TEXTURE_SIZE (128 * 1024 * 1024)
+#define VMW_FENCE_TIMEOUT_SECONDS 60
struct vmw_region
{
@@ -721,7 +722,7 @@ vmw_ioctl_fence_finish(struct vmw_winsys_screen *vws,
memset(&arg, 0, sizeof(arg));
arg.handle = handle;
- arg.timeout_us = 10*1000000;
+ arg.timeout_us = VMW_FENCE_TIMEOUT_SECONDS*1000000;
arg.lazy = 0;
arg.flags = vflags;