From: Philipp Kerling <pkerling@casix.org>
Date: Tue, 13 Jun 2017 07:54:06 +0000 (+0200)
Subject: wayland: Also support wl_drm version 1
X-Git-Tag: android-x86-7.1-r1~6
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fhardware-intel-common-libva.git;a=commitdiff_plain;h=83fcb107ad01ee6acc558b736b12db6bea6f7d2f

wayland: Also support wl_drm version 1

Just using version 2 without checking would lead to a protocol error
bringing down the entire application, and wl_drm version 1 is still
supported since v2 only adds PRIME capabilities.

Signed-off-by: Philipp Kerling <pkerling@casix.org>
---

diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c
index 97dfee1..4a24a2c 100644
--- a/va/wayland/va_wayland_drm.c
+++ b/va/wayland/va_wayland_drm.c
@@ -183,8 +183,12 @@ registry_handle_global(
     struct va_wayland_drm_context *wl_drm_ctx = data;
 
     if (strcmp(interface, "wl_drm") == 0) {
+        /* bind to at most version 2, but also support version 1 if
+         * compositor does not have v2
+         */
         wl_drm_ctx->drm =
-            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface, 2);
+            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface,
+                             (version < 2) ? version : 2);
     }
 }