summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorVincent Cheah Beng Keat <vincent.beng.keat.cheah@intel.com>2021-04-08 06:59:23 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2021-04-09 02:38:32 (GMT)
commit48b1e9905d312bd050be8960d00f99a79c300728 (patch)
treef126ba52bf0c67c987aef502b7a1ca134b7cab01 /recipes-multimedia
parentbdae07eceb51a038115f45a3aee2dd27323dd7b4 (diff)
downloadmeta-intel-48b1e9905d312bd050be8960d00f99a79c300728.tar.gz
intel-mediasdk: Don't try to autheticate with render node
Fix an issue with while using weston [1]. Patch has been merged upstream and can be removed on next version bump. [1] https://github.com/Intel-Media-SDK/MediaSDK/issues/2657 Signed-off-by: Cheah, Vincent Beng Keat <vincent.beng.keat.cheah@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r--recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch44
-rw-r--r--recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb1
2 files changed, 45 insertions, 0 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
new file mode 100644
index 0000000..d424b68
--- /dev/null
+++ b/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch
@@ -0,0 +1,44 @@
1From 6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a Mon Sep 17 00:00:00 2001
2From: Vincent Cheah Beng Keat <vincent.beng.keat.cheah@intel.com>
3Date: Wed, 7 Apr 2021 05:30:15 +0000
4Subject: [PATCH] Don't try to autheticate with render node
5
6Replicate similar libVA wayland change.
7https://github.com/intel/libva/commit/283f776a9649dcef58b47958c1269499adfa1cd4
8
9Platform: ADL-S, EHL, TGL
10OS: Yocto native wayland weston
11Tested:
12 ./sample_decode h265 -i Puppies_3840x2160.265 -rwld -rgb4
13
14Issue: #2592
15
16Upstream-Status: Backport [https://github.com/Intel-Media-SDK/MediaSDK/commit/6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a]
17
18Signed-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
23diff --git a/samples/sample_misc/wayland/src/class_wayland.cpp b/samples/sample_misc/wayland/src/class_wayland.cpp
24index 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--
432.24.3
44
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb
index 851cc07..b3a30bc 100644
--- a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb
+++ b/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb
@@ -33,6 +33,7 @@ PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland way
33 33
34SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \ 34SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \
35 file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ 35 file://0001-FindITT.cmake-fix-detection-of-header-library.patch \
36 file://0001-Don-t-try-to-autheticate-with-render-node.patch \
36 " 37 "
37 38
38SRCREV = "03164a0b491651c210abd4549ca5275ac974d105" 39SRCREV = "03164a0b491651c210abd4549ca5275ac974d105"