From fd3878ea41fffdd9c1ea34c323f921c416c38a25 Mon Sep 17 00:00:00 2001
From: Lim Siew Hoon <siew.hoon.lim@intel.com>
Date: Wed, 9 Aug 2023 17:07:42 +0800
Subject: onevpl-intel-gpu: upgrade 23.1.5 -> 23.2.4

Drop patches already merged:
 - 0001-Disable-CM-Copy-for-ADL-P-and-RPL-P-4938.patch

Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...-Disable-CM-Copy-for-ADL-P-and-RPL-P-4938.patch | 32 ----------------------
 .../onevpl/onevpl-intel-gpu_23.1.5.bb              | 31 ---------------------
 .../onevpl/onevpl-intel-gpu_23.2.4.bb              | 30 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 63 deletions(-)
 delete mode 100644 recipes-multimedia/onevpl/files/0001-Disable-CM-Copy-for-ADL-P-and-RPL-P-4938.patch
 delete mode 100644 recipes-multimedia/onevpl/onevpl-intel-gpu_23.1.5.bb
 create mode 100644 recipes-multimedia/onevpl/onevpl-intel-gpu_23.2.4.bb

(limited to 'recipes-multimedia')

diff --git a/recipes-multimedia/onevpl/files/0001-Disable-CM-Copy-for-ADL-P-and-RPL-P-4938.patch b/recipes-multimedia/onevpl/files/0001-Disable-CM-Copy-for-ADL-P-and-RPL-P-4938.patch
deleted file mode 100644
index f96231a3..00000000
--- a/recipes-multimedia/onevpl/files/0001-Disable-CM-Copy-for-ADL-P-and-RPL-P-4938.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 22e4f3dfc7f5510cd1fbec3e4e9e1845d35a301a Mon Sep 17 00:00:00 2001
-From: gfxVPLsdm <gfxvplsdm@intel.com>
-Date: Tue, 4 Apr 2023 15:00:15 +0800
-Subject: [PATCH] Disable CM Copy for ADL-P and RPL-P (#4938)
-
-Co-authored-by: Teng, Jin Chung <jin.chung.teng@intel.com>
-
-Upstream-Status: Backport
-Expect it to be removed once move to intel-onevpl-23.2.0 and above.
-https://github.com/oneapi-src/oneVPL-intel-gpu/commit/2ef453cb231ad12a912669d0fc091d8365f436e4
----
- _studio/shared/src/libmfx_core_vaapi.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp
-index 7212e572..baeafb7f 100644
---- a/_studio/shared/src/libmfx_core_vaapi.cpp
-+++ b/_studio/shared/src/libmfx_core_vaapi.cpp
-@@ -830,8 +830,8 @@ bool VAAPIVideoCORE_T<Base>::IsCmSupported()
- template <class Base>
- bool VAAPIVideoCORE_T<Base>::IsCmCopyEnabledByDefault()
- {
--    // For Linux by default CM copy is ON on RKL/ADL
--    return IsCmSupported() && GetHWType() != MFX_HW_DG1 && GetHWType() != MFX_HW_TGL_LP;
-+    // For Linux by default CM copy is ON on RKL/ADL-S
-+    return IsCmSupported() && GetHWType() != MFX_HW_DG1 && GetHWType() != MFX_HW_TGL_LP && GetHWType() != MFX_HW_ADL_P;
- }
- 
- template <class Base>
--- 
-2.40.1
-
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.1.5.bb b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.1.5.bb
deleted file mode 100644
index af6d50d3..00000000
--- a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.1.5.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Intel(R) oneVPL runtime for Intel GPU accelerated media processing"
-DESCRIPTION = "Intel(R) oneVPL runtime provides an runtime to access hardware-accelerated \
-video decode, encode and filtering on Intel® graphics."
-
-HOMEPAGE = "https://github.com/oneapi-src/oneVPL-intel-gpu"
-BUGTRACKER = "https://github.com/oneapi-src/oneVPL-intel-gpu/issues"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=eb8cb45b9b57dbaa9fcc9adc4230202b"
-
-PE = "1"
-
-# Only for 64 bit
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:x86-x32 = "null"
-
-DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native"
-RDEPENDS:${PN} += "intel-media-driver"
-
-SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \
-           file://0001-Disable-CM-Copy-for-ADL-P-and-RPL-P-4938.patch \
-          "
-
-SRCREV = "3bc35c59ab64f60c3f73eaa83ada600859999493"
-S = "${WORKDIR}/git"
-
-FILES:${PN} += " \
-                ${libdir}/libmfx-gen/enctools.so \
-               "
-
-inherit cmake
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.2.4.bb b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.2.4.bb
new file mode 100644
index 00000000..2a2233e1
--- /dev/null
+++ b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.2.4.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Intel(R) oneVPL runtime for Intel GPU accelerated media processing"
+DESCRIPTION = "Intel(R) oneVPL runtime provides an runtime to access hardware-accelerated \
+video decode, encode and filtering on Intel® graphics."
+
+HOMEPAGE = "https://github.com/oneapi-src/oneVPL-intel-gpu"
+BUGTRACKER = "https://github.com/oneapi-src/oneVPL-intel-gpu/issues"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=eb8cb45b9b57dbaa9fcc9adc4230202b"
+
+PE = "1"
+
+# Only for 64 bit
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:x86-x32 = "null"
+
+DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native"
+RDEPENDS:${PN} += "intel-media-driver"
+
+SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \
+          "
+
+SRCREV = "b2af8d128452c4b4c94399f051c3214f11c1dfa9"
+S = "${WORKDIR}/git"
+
+FILES:${PN} += " \
+                ${libdir}/libmfx-gen/enctools.so \
+               "
+
+inherit cmake
-- 
cgit v1.2.3-54-g00ecf