virgl: fix fence fd version check
authorChia-I Wu <olvaffe@gmail.com>
Tue, 9 Apr 2019 20:46:38 +0000 (20:46 +0000)
committerGurchetan Singh <gurchetansingh@chromium.org>
Mon, 15 Apr 2019 23:25:47 +0000 (23:25 +0000)
Fixes: d1a1c21e762 ("virgl: native fence fd support")
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/gallium/winsys/virgl/drm/virgl_drm_winsys.c

index e78c0856145d2c777b6ffe263371e87fc52c376e..4cefbe92077aa7feed3aff52d065fbff26181767 100644 (file)
@@ -47,7 +47,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)
@@ -966,7 +966,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);