Mesa (staging/19.0): virgl: fix fence fd version check

[GitLab Mirror]

Module: Mesa
Branch: staging/19.0
Commit: 3400359432361ae13c7d68620544c52a17392926
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3400359432361ae13c7d68620544c52a17392926

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Tue Apr  9 20:46:38 2019 +0000

virgl: fix fence fd version check

Fixes: d1a1c21e762 ("virgl: native fence fd support")

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
(cherry picked from commit c45c889f95b07cc95cf5ad6fdefc2fa9bb66b960)

---

 src/gallium/winsys/virgl/drm/virgl_drm_winsys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
index 26de8c702df..a2d232a539c 100644
--- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
+++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
@@ -46,7 +46,7 @@
 
 
 #define VIRGL_DRM_VERSION(major, minor) ((major) << 16 | (minor))
-#define VIRGL_DRM_VERSION_FENCE_FD      VIRGL_DRM_VERSION(1, 0)
+#define VIRGL_DRM_VERSION_FENCE_FD      VIRGL_DRM_VERSION(0, 1)
 
 
 static inline boolean can_cache_resource(struct virgl_hw_res *res)
@@ -870,7 +870,7 @@ static int virgl_drm_get_version(int fd)
 	else if (version->version_major != 0)
 		ret = -EINVAL;
 	else
-		ret = version->version_minor;
+		ret = VIRGL_DRM_VERSION(0, version->version_minor);
 
 	drmFreeVersion(version);