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 00000000..d424b68d
--- /dev/null
+++ b/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch
@@ -0,0 +1,44 @@
+From 6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a Mon Sep 17 00:00:00 2001
+From: Vincent Cheah Beng Keat <vincent.beng.keat.cheah@intel.com>
+Date: Wed, 7 Apr 2021 05:30:15 +0000
+Subject: [PATCH] Don't try to autheticate with render node
+
+Replicate similar libVA wayland change.
+https://github.com/intel/libva/commit/283f776a9649dcef58b47958c1269499adfa1cd4
+
+Platform: ADL-S, EHL, TGL
+OS: Yocto native wayland weston
+Tested:
+    ./sample_decode h265 -i Puppies_3840x2160.265 -rwld -rgb4
+
+Issue: #2592
+
+Upstream-Status: Backport [https://github.com/Intel-Media-SDK/MediaSDK/commit/6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a]
+
+Signed-off-by: Cheah, Vincent Beng Keat <vincent.beng.keat.cheah@intel.com>
+---
+ samples/sample_misc/wayland/src/class_wayland.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/samples/sample_misc/wayland/src/class_wayland.cpp b/samples/sample_misc/wayland/src/class_wayland.cpp
+index 62f326e3..4a0beed3 100644
+--- a/samples/sample_misc/wayland/src/class_wayland.cpp
++++ b/samples/sample_misc/wayland/src/class_wayland.cpp
+@@ -433,8 +433,12 @@ void Wayland::DrmHandleDevice(const char *name)
+             m_device_name << "\n";
+         return;
+     }
+-    drmGetMagic(m_fd, &magic);
+-    wl_drm_authenticate(m_drm, magic);
++
++    int type = drmGetNodeTypeFromFd(m_fd);
++    if (type != DRM_NODE_RENDER) {
++        drmGetMagic(m_fd, &magic);
++        wl_drm_authenticate(m_drm, magic);
++    }
+ }
+ 
+ void Wayland::DrmHandleAuthenticated()
+-- 
+2.24.3
+
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb
index 851cc07d..b3a30bc4 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
 
 SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \
            file://0001-FindITT.cmake-fix-detection-of-header-library.patch \
+           file://0001-Don-t-try-to-autheticate-with-render-node.patch \
            "
 
 SRCREV = "03164a0b491651c210abd4549ca5275ac974d105"