提交: 83fcb107ad01ee6acc558b736b12db6bea6f7d2f - hardware-intel-common-libva (git)

hardware/intel/common/libva

Commit MetaInfo

• 修订版: 83fcb107ad01ee6acc558b736b12db6bea6f7d2f (tree)
• 时间: 2017-06-15 17:40:48
• 作者: Philipp Kerling <pkerling@casi...>
• Commiter: Xiang, Haihao

Log Message

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 <[e-mail]>

更改概述

• modified: va/wayland/va_wayland_drm.c

差异

--- 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);
     }
 }