From: Leo Liu <leo.liu@amd.com>
Date: Tue, 17 May 2016 19:16:09 +0000 (-0400)
Subject: st/va: use drm render node for wayland display type
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f90d11d86e476c679abbc0420ea22bd14b53ef7;p=mesa.git

st/va: use drm render node for wayland display type

With xwayland, vainfo use VA_DISPLAY_WAYLAND as default and it fails
and fails when specify display with  `vainfo --display wayland`.
In fact wayland support for libva uses drm path to connect device,
and should use drm pipe loader to create screen.

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c
index 93ab3d98ec2..51abd87cc4e 100644
--- a/src/gallium/state_trackers/va/context.c
+++ b/src/gallium/state_trackers/va/context.c
@@ -114,7 +114,6 @@ VA_DRIVER_INIT_FUNC(VADriverContextP ctx)
 
    switch (ctx->display_type) {
    case VA_DISPLAY_ANDROID:
-   case VA_DISPLAY_WAYLAND:
       FREE(drv);
       return VA_STATUS_ERROR_UNIMPLEMENTED;
    case VA_DISPLAY_GLX:
@@ -127,6 +126,7 @@ VA_DRIVER_INIT_FUNC(VADriverContextP ctx)
       if (!drv->vscreen)
          goto error_screen;
       break;
+   case VA_DISPLAY_WAYLAND:
    case VA_DISPLAY_DRM:
    case VA_DISPLAY_DRM_RENDERNODES: {
       drm_info = (struct drm_state *) ctx->drm_state;