|
 |
fa677b |
From dc81b3ad43dde0815baf957e7cf4c633d6f350f8 Mon Sep 17 00:00:00 2001
|
|
|
fa677b |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
|
fa677b |
Date: Tue, 7 Jun 2016 14:54:34 +0200
|
|
|
fa677b |
Subject: [PATCH] virgl: fix checking fences
|
|
|
fa677b |
MIME-Version: 1.0
|
|
|
fa677b |
Content-Type: text/plain; charset=UTF-8
|
|
|
fa677b |
Content-Transfer-Encoding: 8bit
|
|
|
fa677b |
|
|
|
fa677b |
When calling virgl_fence_wait() with timeout=0,
|
|
|
fa677b |
virgl_{drm,vtest}_resource_is_busy() is called. However, it returns TRUE
|
|
|
fa677b |
for a busy resource, whereace virgl_fence_wait() should return TRUE for
|
|
|
fa677b |
a completed (non-busy) resource.
|
|
|
fa677b |
|
|
|
fa677b |
This fixes running supertuxkart in a VM (I could not reproduce locally
|
|
|
fa677b |
with vtest though there is a similar fix)
|
|
|
fa677b |
|
|
|
fa677b |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
fa677b |
Cc: "11.1 11.2 12.0" <mesa-stable@lists.freedesktop.org>
|
|
|
fa677b |
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
|
fa677b |
---
|
|
|
fa677b |
src/gallium/winsys/virgl/drm/virgl_drm_winsys.c | 2 +-
|
|
|
fa677b |
src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c | 2 +-
|
|
|
fa677b |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
fa677b |
|
|
|
fa677b |
diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
|
|
|
fa677b |
index c77b899..81afa84 100644
|
|
|
fa677b |
--- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
|
|
|
fa677b |
+++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
|
|
|
fa677b |
@@ -734,7 +734,7 @@ static bool virgl_fence_wait(struct virgl_winsys *vws,
|
|
|
fa677b |
struct virgl_hw_res *res = virgl_hw_res(fence);
|
|
|
fa677b |
|
|
|
fa677b |
if (timeout == 0)
|
|
|
fa677b |
- return virgl_drm_resource_is_busy(vdws, res);
|
|
|
fa677b |
+ return !virgl_drm_resource_is_busy(vdws, res);
|
|
|
fa677b |
|
|
|
fa677b |
if (timeout != PIPE_TIMEOUT_INFINITE) {
|
|
|
fa677b |
int64_t start_time = os_time_get();
|
|
|
fa677b |
diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
|
|
|
fa677b |
index 9c9ec04..ce8ac97 100644
|
|
|
fa677b |
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
|
|
|
fa677b |
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
|
|
|
fa677b |
@@ -544,7 +544,7 @@ static bool virgl_fence_wait(struct virgl_winsys *vws,
|
|
|
fa677b |
struct virgl_hw_res *res = virgl_hw_res(fence);
|
|
|
fa677b |
|
|
|
fa677b |
if (timeout == 0)
|
|
|
fa677b |
- return virgl_vtest_resource_is_busy(vdws, res);
|
|
|
fa677b |
+ return !virgl_vtest_resource_is_busy(vdws, res);
|
|
|
fa677b |
|
|
|
fa677b |
if (timeout != PIPE_TIMEOUT_INFINITE) {
|
|
|
fa677b |
int64_t start_time = os_time_get();
|
|
|
fa677b |
--
|
|
|
fa677b |
2.5.5
|
|
|
fa677b |
|