diff options
author | DetMittens | 2019-02-02 13:01:46 +0000 |
---|---|---|
committer | DetMittens | 2019-02-02 13:01:46 +0000 |
commit | aee7abc98524203bf1c086deceff9d3c0fea7596 (patch) | |
tree | 63e58ad26b11807660b4bf62929f0a4563b68017 /427.patch | |
parent | d56d2ca5ddcef1ad27f945a7e78476ca47f06d23 (diff) | |
download | aur-aee7abc98524203bf1c086deceff9d3c0fea7596.tar.gz |
Include patch to fix upstream bug #427
Diffstat (limited to '427.patch')
-rw-r--r-- | 427.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/427.patch b/427.patch new file mode 100644 index 000000000000..906fa8cd4c41 --- /dev/null +++ b/427.patch @@ -0,0 +1,65 @@ +From 0abb7a1c938437000bfca1a9b3706884467c681e Mon Sep 17 00:00:00 2001 +From: Haihao Xiang <haihao.xiang@intel.com> +Date: Fri, 7 Dec 2018 13:31:43 +0800 +Subject: [PATCH] Check the interface from libva first + +This fixes https://github.com/intel/intel-vaapi-driver/issues/419 + +Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> +--- + src/i965_output_wayland.c | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c +index 122db953..a637552e 100644 +--- a/src/i965_output_wayland.c ++++ b/src/i965_output_wayland.c +@@ -397,6 +397,7 @@ i965_output_wayland_init(VADriverContextP ctx) + struct i965_driver_data * const i965 = i965_driver_data(ctx); + struct dso_handle *dso_handle; + struct wl_vtable *wl_vtable; ++ struct VADriverVTableWayland * const vtable = ctx->vtable_wayland; + + static const struct dso_symbol libegl_symbols[] = { + { +@@ -465,25 +466,29 @@ i965_output_wayland_init(VADriverContextP ctx) + if (!i965->wl_output) + goto error; + +- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); +- if (!i965->wl_output->libegl_handle) { +- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); +- if (!i965->wl_output->libegl_handle) ++ wl_vtable = &i965->wl_output->vtable; ++ ++ if (vtable->wl_interface) ++ wl_vtable->drm_interface = vtable->wl_interface; ++ else { ++ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); ++ if (!i965->wl_output->libegl_handle) { ++ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); ++ if (!i965->wl_output->libegl_handle) ++ goto error; ++ } ++ ++ dso_handle = i965->wl_output->libegl_handle; ++ if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), ++ libegl_symbols)) + goto error; + } + +- dso_handle = i965->wl_output->libegl_handle; +- wl_vtable = &i965->wl_output->vtable; +- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), +- libegl_symbols)) +- goto error; +- + i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME); + if (!i965->wl_output->libwl_client_handle) + goto error; + + dso_handle = i965->wl_output->libwl_client_handle; +- wl_vtable = &i965->wl_output->vtable; + if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), + libwl_client_symbols)) + goto error; |