diff options
author | Lim Siew Hoon <siew.hoon.lim@intel.com> | 2021-07-03 02:39:09 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-03 22:48:10 +0800 |
commit | 7c288f85925a0caf86d4f2259d7adfcd82febe95 (patch) | |
tree | 98f92e3567dc50cf74ae13f4d81818977a1dd73b /recipes-multimedia/mediasdk/files | |
parent | db0de0a972cec8eef97847a883ab992e6f71adbd (diff) | |
download | meta-intel-7c288f85925a0caf86d4f2259d7adfcd82febe95.tar.gz |
intel-mediasdk: upgrade 21.1.3 -> 21.2.3
Drops patches already merged:
* 0001-Don-t-try-to-autheticate-with-render-node.patch
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia/mediasdk/files')
-rw-r--r-- | recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch b/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch deleted file mode 100644 index d424b68d..00000000 --- a/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Vincent Cheah Beng Keat <vincent.beng.keat.cheah@intel.com> | ||
3 | Date: Wed, 7 Apr 2021 05:30:15 +0000 | ||
4 | Subject: [PATCH] Don't try to autheticate with render node | ||
5 | |||
6 | Replicate similar libVA wayland change. | ||
7 | https://github.com/intel/libva/commit/283f776a9649dcef58b47958c1269499adfa1cd4 | ||
8 | |||
9 | Platform: ADL-S, EHL, TGL | ||
10 | OS: Yocto native wayland weston | ||
11 | Tested: | ||
12 | ./sample_decode h265 -i Puppies_3840x2160.265 -rwld -rgb4 | ||
13 | |||
14 | Issue: #2592 | ||
15 | |||
16 | Upstream-Status: Backport [https://github.com/Intel-Media-SDK/MediaSDK/commit/6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a] | ||
17 | |||
18 | Signed-off-by: Cheah, Vincent Beng Keat <vincent.beng.keat.cheah@intel.com> | ||
19 | --- | ||
20 | samples/sample_misc/wayland/src/class_wayland.cpp | 8 ++++++-- | ||
21 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/samples/sample_misc/wayland/src/class_wayland.cpp b/samples/sample_misc/wayland/src/class_wayland.cpp | ||
24 | index 62f326e3..4a0beed3 100644 | ||
25 | --- a/samples/sample_misc/wayland/src/class_wayland.cpp | ||
26 | +++ b/samples/sample_misc/wayland/src/class_wayland.cpp | ||
27 | @@ -433,8 +433,12 @@ void Wayland::DrmHandleDevice(const char *name) | ||
28 | m_device_name << "\n"; | ||
29 | return; | ||
30 | } | ||
31 | - drmGetMagic(m_fd, &magic); | ||
32 | - wl_drm_authenticate(m_drm, magic); | ||
33 | + | ||
34 | + int type = drmGetNodeTypeFromFd(m_fd); | ||
35 | + if (type != DRM_NODE_RENDER) { | ||
36 | + drmGetMagic(m_fd, &magic); | ||
37 | + wl_drm_authenticate(m_drm, magic); | ||
38 | + } | ||
39 | } | ||
40 | |||
41 | void Wayland::DrmHandleAuthenticated() | ||
42 | -- | ||
43 | 2.24.3 | ||
44 | |||