44 files changed, 360 insertions, 1351 deletions
diff --git a/README.md b/README.md
index ef1dd842..91577f1d 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,13 @@ Dynamic additional dependencies:
 - [Building and booting meta-intel BSP layers](documentation/building_and_booting.md)
 - [Intel oneAPI DPC++/C++ Compiler](documentation/dpcpp-compiler.md)
+- [Build Image with OpenVINO™ toolkit](documentation/openvino.md)
 - [Tested Hardware](documentation/tested_hardware.md)
 - [Guidelines for submitting patches](documentation/submitting_patches.md)
 - [Reporting bugs](documentation/reporting_bugs.md)
 - [Reporting security bugs](SECURITY.md)
- [Maintainers](documentation/MAINTAINERS.md)
+## Maintainers
+- Anuj Mittal <anuj.mittal@intel.com>
diff --git a/documentation/MAINTAINERS.md b/documentation/MAINTAINERS.md
deleted file mode 100644
index ea435849..00000000
--- a/documentation/MAINTAINERS.md
+++ /dev/null
@@ -1,28 +0,0 @@
-The purpose of this file is to provide contact information for
-specific BSPs and other code contained within meta-intel. You should
-address questions and patches for a particular BSP or other code to
-the appropriate maintainer listed in this file, cc'ing the meta-intel
-mailing list. This ensures that your question or patch will be
-addressed by the appropriate person, and that it will be seen by other
-users who may be facing similar problems or questions.
-Please see the [Guidelines for submitting patches](submitting_patches.md)
-and [Reporting bugs](reporting_bugs.md) guidelines relating to the
-details of submitting patches, reporting problems, or asking questions
-about any of the BSPs or other recipes contained within meta-intel.
-Descriptions of section entries:
-        M: Mail patches to: FullName <address@domain>
-        F: Files and directories with wildcard patterns.
-           A trailing slash includes all files and subdirectory files.
-           F:   common/  all files in and below common
-           F:   common/* all files in common, but not below
-           One pattern per line.  Multiple F: lines acceptable.
-Please keep this list in alphabetical order.
-Maintainers List (try to look for most precise areas first)
-M: Anuj Mittal <anuj.mittal@intel.com>
-F: *
diff --git a/documentation/openvino.md b/documentation/openvino.md
new file mode 100644
index 00000000..50dc680d
--- /dev/null
+++ b/documentation/openvino.md
@@ -0,0 +1,95 @@
+Build a Yocto Image with OpenVINO™ toolkit
+==========================================
+Follow the [Yocto Project official documentation](https://docs.yoctoproject.org/brief-yoctoprojectqs/index.html#compatible-linux-distribution) to set up and configure your host machine to be compatible with BitBake.
+## Step 1: Set Up Environment
+1. Clone the repositories.
+```
+      git clone https://git.yoctoproject.org/git/poky
+      git clone https://github.com/openembedded/meta-openembedded
+      git clone https://git.yoctoproject.org/git/meta-intel
+```
+2. Set up the OpenEmbedded build environment.
+```
+      source poky/oe-init-build-env
+```
+3. Add BitBake layers.
+```
+      bitbake-layers add-layer ../meta-openembedded/meta-oe
+      bitbake-layers add-layer ../meta-openembedded/meta-python
+      bitbake-layers add-layer ../meta-intel
+```
+4. Set up BitBake configurations.
+   Include extra configuration in the `conf/local.conf` file in your build directory as required.
+```
+      MACHINE = "intel-skylake-64"
+      # Enable building OpenVINO Python API.
+      # This requires meta-python layer to be included in bblayers.conf.
+      PACKAGECONFIG:append:pn-openvino-inference-engine = " python3"
+      # This adds OpenVINO related libraries in the target image.
+      CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine"
+      # This adds OpenVINO samples in the target image.
+      CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine-samples"
+      # Include OpenVINO Python API package in the target image.
+      CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine-python3"
+      # Include model conversion API in the target image.
+      CORE_IMAGE_EXTRA_INSTALL:append = " openvino-model-optimizer"
+```
+## Step 2: Build a Yocto Image with OpenVINO Packages
+Run BitBake to build your image with OpenVINO packages. For example, to build the minimal image, run the following command:
+```
+   bitbake core-image-minimal
+```
+## Step 3: Verify the Yocto Image
+Verify that OpenVINO packages were built successfully. Run the following command:
+```
+   oe-pkgdata-util list-pkgs | grep openvino
+```
+If the image build is successful, it will return the list of packages as below:
+```
+   openvino-inference-engine
+   openvino-inference-engine-dbg
+   openvino-inference-engine-dev
+   openvino-inference-engine-python3
+   openvino-inference-engine-samples
+   openvino-inference-engine-src
+   openvino-model-optimizer
+   openvino-model-optimizer-dbg
+   openvino-model-optimizer-dev
+```
diff --git a/documentation/reporting_bugs.md b/documentation/reporting_bugs.md
index 59621c1e..5fbc3d27 100644
--- a/documentation/reporting_bugs.md
+++ b/documentation/reporting_bugs.md
@@ -1,7 +1,7 @@
 ## Reporting bugs
 If you have problems with or questions about a particular BSP, please
-contact the maintainer listed in the [Maintainers](MAINTAINERS.md) file directly (cc:ing
+contact the maintainer listed in the [Maintainer](../README.md#maintainers) section directly (cc:ing
 the Yocto mailing list puts it in the archive and helps other people
 who might have the same questions in the future), but please try to do
 the following first:
diff --git a/documentation/submitting_patches.md b/documentation/submitting_patches.md
index 41a039bd..f36c4b08 100644
--- a/documentation/submitting_patches.md
+++ b/documentation/submitting_patches.md
@@ -22,5 +22,5 @@ a patch or patch sets within 24 hours of the time it was posted.  For
 larger and/or more involved patches and patch sets, the review process
 may take longer.
-Please see the [MAINTAINERS](MAINTAINERS.md)  for the list of maintainers. It's also
+Please see the [maintainers](../README.md#maintainers) section for the list of maintainers. It's also
 a good idea to cc: the maintainer, if applicable.
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb
index afea70df..2fa3f627 100644
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb
@@ -15,7 +15,7 @@ inherit pkgconfig cmake ptest
 DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 S = "${WORKDIR}/git"
-SRCREV = "ecd7fb6d5a0df6503d1691c1754a684b9c769c16"
+SRCREV = "f5ff0a6de16c130053bec1a1aec3a9b826c66f78"
 SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \
           file://run-ptest \
           "
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb
index 60125171..5214d5cf 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb
@@ -8,13 +8,13 @@ LICENSE = "MIT & Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
                    file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.05 \
+SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.13 \
           file://disable-werror.patch \
           file://allow-to-find-cpp-generation-tool.patch \
           file://external-ocloc.patch \
           "
-SRCREV = "23a9725e62c8181193c90e5e5207507a1f136587"
+SRCREV = "7131387cdbb02d480a225c70daef913a6c024a6e"
 S = "${WORKDIR}/git"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
index 96d828b6..24eb97bd 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
@@ -6,9 +6,9 @@ hardware architecture."
 LICENSE = "MIT & Apache-2.0"
 LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
                    file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \
-                    file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a"
+                    file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880"
-SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.15985 \
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.16510 \
           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \
           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \
           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;nam
 SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
-SRCREV_igc = "6cc111d262e1c3abcf4bc6b6d8a589ebf821a5c0"
+SRCREV_igc = "c2495d45f37fadd963ad22eb0cc1a8235a306775"
-SRCREV_vc = "da892e1982b6c25b9a133f85b4ac97142d8a3def"
+SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd"
 SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
-SRCREV_spirv-headers = "cca08c63cefa129d082abca0302adcb81610b465"
+SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
 SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb
index 70177c28..de765d6c 100644
--- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb
+++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb
@@ -5,9 +5,9 @@ environment, performs static model analysis, and adjusts deep \
 learning models for optimal execution on end-point target devices."
 HOMEPAGE = "https://01.org/openvinotoolkit"
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/0;lfs=0 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/1;lfs=0 \
           "
-SRCREV = "34caeefd07800b59065345d651949efbe8ab6649"
+SRCREV = "f4afc983258bcb2592d999ed6700043fdb58ad78"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
index 270cc84d..ea86bc31 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
@@ -1,4 +1,4 @@
-From c4c049481d48f33319b1d04cad56d622c4eed65f Mon Sep 17 00:00:00 2001
+From 1f6f4e29769adb9d49a3c4831dd2ba61f6ccbdce Mon Sep 17 00:00:00 2001
 From: Yogesh Tyagi <yogesh.tyagi@intel.com>
 Date: Mon, 11 Mar 2024 13:13:32 +0800
 Subject: [PATCH] Makefile: Fix build Issue
@@ -6,14 +6,13 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-In case build directory is different from source, make sure make is able to find the correct input files. 
+In case build directory is different from source, make sure make is able to find the correct input files.
 Fixes:
 | dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml
 | glib-compile-resources --generate-source thermald-resource.gresource.xml
 | Failed to open file “thermald-resource.gresource.xml”: No such file or directory
 Upstream-Status: Submitted
 https://github.com/intel/thermal_daemon/pull/436
@@ -23,10 +22,10 @@ Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/Makefile.am b/Makefile.am
-index a0c051a..772e280 100644
+index dd2ef10..cb19e17 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -95,6 +95,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml
+@@ -97,6 +97,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml
        $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $<
 
 thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml
@@ -34,6 +33,3 @@ index a0c051a..772e280 100644
 +       $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $<
 
 CLEANFILES = $(BUILT_SOURCES)
-- 
-2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
index df242cdf..66765e56 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
           file://0001-Makefile-Fix-build-Issue.patch \
           "
-SRCREV = "3990ce2391e5c07293758c056e09e4f2453691b4"
+SRCREV = "ea8b773f76641a7a49d6584669e17371c22ad03e"
 S = "${WORKDIR}/git"
 inherit pkgconfig autotools systemd gtk-doc
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch
deleted file mode 100644
index d1851406..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b8c3bae71e6d3417ade5cb537cb1785fd75a75c8 Mon Sep 17 00:00:00 2001
-From: Razvan Apetroaie <117895604+razvanapetroaie@users.noreply.github.com>
-Date: Tue, 20 Feb 2024 02:28:14 +0200
-Subject: [PATCH] [CPU] Solving the build failure caused by setting the
- "ENABLE_OV_ONNX_FRONTEND" option to "OFF" (#22934)
-### Details:
-See the [ticket
-description](https://jira.devtools.intel.com/browse/CVS-132119). The
-solution was checked only on a local setup on Ubuntu, if there's a way
-to check that using the CI please let me know (or if you could run the
-job and paste the link in the comments I would be grateful).
-Disclaimer: I'm not a CPU plugin developer, so I can't tell for sure if
-this is the ideal fix and no side effects are introduced. Please take
-that into account when reviewing/merging.
-### Tickets:
- - [CVS-132119](https://jira.devtools.intel.com/browse/CVS-132119)
-Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/b8c3bae71e6d3417ade5cb537cb1785fd75a75c8]
-Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
---
- src/plugins/intel_cpu/tests/functional/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-index db5ae8d01c..6941cb528d 100644
--- a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-+++ b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo openvino::snippets ov_snipp
- if(ENABLE_OV_ONNX_FRONTEND)
-     list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}")
- else()
-    set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx)
-+    set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/custom/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx)
- endif()
- 
- if(NOT (ARM OR AARCH64))
-- 
-2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch
deleted file mode 100644
index d251f21b..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b5dfcf8bc1245e804c847745c237068eb6f19931 Mon Sep 17 00:00:00 2001
-From: Yogesh Tyagi <yogesh.tyagi@intel.com>
-Date: Fri, 15 Mar 2024 16:28:41 +0800
-Subject: [PATCH] cmake: fix build when using sysroot
-When cross-compiling against a sysroot, system headers will not be at a place
-that starts with /usr. Update conditional check to exclude directories
-which have "/usr/include" in them to not add <sysroot>/usr/include as well.
-Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/23486]
-Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
---
- src/cmake/ov_parallel.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake
-index 3793db98e30..819d3410531 100644
--- a/src/cmake/ov_parallel.cmake
-+++ b/src/cmake/ov_parallel.cmake
-@@ -296,7 +296,7 @@ function(ov_set_threading_interface_for TARGET_NAME)
-                 if(include_directories)
-                     foreach(include_directory IN LISTS include_directories)
-                         # cannot include /usr/include headers as SYSTEM
-                        if(NOT "${include_directory}" MATCHES "^/usr.*$")
-+                        if(NOT "${include_directory}" MATCHES ".*/usr/include.*$")
-                             target_include_directories(${TARGET_NAME} SYSTEM
-                                 ${LINK_TYPE} $<BUILD_INTERFACE:${include_directory}>)
-                         else()
-- 
-2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
index 7ab31309..7f5b46c6 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
@@ -1,11 +1,11 @@
-From bfcf5ae581ca4e7266cf7dc65b1c71754cd78cc0 Mon Sep 17 00:00:00 2001
+From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:42:57 +0530
-Subject: [PATCH 1/4] cmake: yocto specific tweaks to the build process
+Subject: [PATCH] cmake: yocto specific tweaks to the build process
 * Dont try to detect glibc version as that doesn't work when cross compiling.
+* Dont try to detect CXX11_ABI
 * Install sample binaries as well.
-* Dont strip binaries.
 * Dont try to write triggers for CPack. We package ourselves.
 * Fix the installation path for Python modules when baselib = lib64.
@@ -14,17 +14,16 @@ Upstream-Status: Inappropriate
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
 cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
- cmake/developer_package/target_flags.cmake      | 2 +-
+ cmake/developer_package/target_flags.cmake      | 4 ++--
 samples/cpp/CMakeLists.txt                      | 6 +++---
 src/bindings/python/CMakeLists.txt              | 2 +-
- src/bindings/python/wheel/setup.py              | 1 -
+ 4 files changed, 7 insertions(+), 7 deletions(-)
- 5 files changed, 6 insertions(+), 7 deletions(-)
 diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
-index a7c0ec2cf61..40448e8a962 100644
+index 99f11730983..1a1f61fcd3d 100644
 --- a/cmake/developer_package/packaging/rpm/rpm.cmake
 +++ b/cmake/developer_package/packaging/rpm/rpm.cmake
-@@ -154,7 +154,7 @@ ov_rpm_specific_settings()
+@@ -156,7 +156,7 @@ ov_rpm_specific_settings()
 # needed to add triggers for packages with libraries
 set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
 set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
@@ -34,17 +33,26 @@ index a7c0ec2cf61..40448e8a962 100644
 #
 # Functions helpful for packaging your modules with RPM cpack
 diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
-index 29f23e713e1..942dd445b19 100644
+index d047a1aebd9..4e8ca68c60f 100644
 --- a/cmake/developer_package/target_flags.cmake
 +++ b/cmake/developer_package/target_flags.cmake
-@@ -145,4 +145,4 @@ function(ov_glibc_version)
+@@ -149,7 +149,7 @@ function(ov_glibc_version)
     endif()
 endfunction()
 
 -ov_glibc_version()
 +#ov_glibc_version()
+ 
+ #
+ # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler
+@@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi)
+     endif()
+ endmacro()
+ 
+-ov_get_glibcxx_use_cxx11_abi()
+#ov_get_glibcxx_use_cxx11_abi()
 diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
-index c814cc37e2c..431e7bd2ed3 100644
+index 4d33bff944e..3e7f1458578 100644
 --- a/samples/cpp/CMakeLists.txt
 +++ b/samples/cpp/CMakeLists.txt
 @@ -206,9 +206,9 @@ macro(ov_add_sample)
@@ -61,30 +69,18 @@ index c814cc37e2c..431e7bd2ed3 100644
     # create global target with all samples / demo apps
     if(NOT TARGET ov_samples)
 diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
-index 58ff9b74302..4763994ba56 100644
+index 6cf43ec3fed..d539b9d003f 100644
 --- a/src/bindings/python/CMakeLists.txt
 +++ b/src/bindings/python/CMakeLists.txt
-@@ -356,7 +356,7 @@ if(ENABLE_PYTHON_PACKAGING)
+@@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING)
-     endif()
+     # install OpenVINO Python API
 
     set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}")
 -    set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}")
 +    set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}")
-     set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
+     set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
-     set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO")
+     set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO")
- 
-diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py
-index 4b056912212..5f05d891310 100644
--- a/src/bindings/python/wheel/setup.py
-+++ b/src/bindings/python/wheel/setup.py
-@@ -270,7 +270,6 @@ class CustomBuild(build):
-                 self.spawn(["cmake", "--install", binary_dir,
-                                      "--prefix", prefix,
-                                      "--config", CONFIG,
-                                     "--strip",
-                                      "--component", cpack_comp_name])
 
-     def run(self):
 -- 
 2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
index e0967d55..8a1464d5 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
@@ -1,7 +1,7 @@
-From 900eeeb2953095e651270c0f42ccd8b26fd7885c Mon Sep 17 00:00:00 2001
+From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:49:35 +0530
-Subject: [PATCH 3/4] cmake: Fix overloaded-virtual error
+Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error
 * Remove -Werror for:
 |git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=]
@@ -16,10 +16,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
-index b0c66a435d6..a3037147cc2 100644
+index 2f3d9127dde..2fd4f5c1b3c 100644
 --- a/src/plugins/intel_gpu/CMakeLists.txt
 +++ b/src/plugins/intel_gpu/CMakeLists.txt
-@@ -38,7 +38,7 @@ add_subdirectory(thirdparty)
+@@ -47,7 +47,7 @@ add_subdirectory(thirdparty)
 include(thirdparty/cmake/rapidjson.cmake)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
index 59095133..bbdeaa2a 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
@@ -1,7 +1,7 @@
-From 3e288ed876c6bcb6aa3174e52446b479255ddf22 Mon Sep 17 00:00:00 2001
+From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:55:19 +0530
-Subject: [PATCH 4/4] protobuf: allow target protoc to be built
+Subject: [PATCH 3/3] protobuf: allow target protoc to be built
 We can run target binaries using a qemu wrapper so allow these to be
 built and run.
@@ -15,10 +15,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 2 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
-index 49c5b881030..2a1ea8562bc 100644
+index f3b5520d6d2..7579f638c5a 100644
 --- a/cmake/developer_package/frontends/frontends.cmake
 +++ b/cmake/developer_package/frontends/frontends.cmake
-@@ -143,7 +143,7 @@ macro(ov_add_frontend)
+@@ -163,7 +163,7 @@ macro(ov_add_frontend)
         set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h)
         add_custom_command(
                 OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}"
@@ -28,10 +28,10 @@ index 49c5b881030..2a1ea8562bc 100644
                 COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}"
                 VERBATIM
 diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt
-index 4b6d6da87f3..409e492a5b3 100644
+index 15f32601f23..36853caf7dc 100644
 --- a/thirdparty/protobuf/CMakeLists.txt
 +++ b/thirdparty/protobuf/CMakeLists.txt
-@@ -28,7 +28,7 @@ set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Abseil protogate CXX standard to depen
+@@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE)
 if(CMAKE_CROSSCOMPILING OR
     (APPLE AND (HOST_X86_64 AND AARCH64)) OR
     (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM))))
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
index 495a4786..a9422e70 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=mast
           file://0001-use-oe-gflags.patch \
           "
-SRCREV = "37f60eb7fe1dcdedc552b2fb184d646723ed5e80"
+SRCREV = "cf5141dad2a4f24e1c5d5b9d43219ed804c48bbf"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@@ -44,11 +44,11 @@ do_install(){
        install -d ${D}${bindir}
        install -d ${D}${datadir}/openvino/open-model-zoo/tools
        install -d ${D}${datadir}/openvino/open-model-zoo/demos
-        cp -rf ${WORKDIR}/build/intel64/Release/*.a ${D}${libdir}
+        cp -rf ${B}/intel64/Release/*.a ${D}${libdir}
-        cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
+        cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir}
-        cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
+        cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo
+        cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
+        cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
 }
 FILES:${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
index 94edd1b8..675d9920 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
 deep learning models through a high-level C++ Inference Engine API \
 integrated with application logic."
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/0;lfs=0 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/1;lfs=0 \
           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
           git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
           git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
@@ -16,16 +16,15 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=ope
           git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \
           git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \
           git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \
+           git://github.com/openvinotoolkit/telemetry.git;protocol=https;destsuffix=git/thirdparty/telemetry;name=telemetry;nobranch=1;lfs=0 \
           file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \
-           file://0003-cmake-Fix-overloaded-virtual-error.patch \
+           file://0002-cmake-Fix-overloaded-virtual-error.patch \
-           file://0004-protobuf-allow-target-protoc-to-be-built.patch \
+           file://0003-protobuf-allow-target-protoc-to-be-built.patch \
-           file://0001-cmake-fix-build-when-using-sysroot.patch \
-           file://0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch \
           "
-SRCREV_openvino = "34caeefd07800b59065345d651949efbe8ab6649"
+SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78"
-SRCREV_mkl = "f82148befdbdc9576ec721c9d500155ee4de8060"
+SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3"
-SRCREV_onednn = "494af5f9921bdae98f1a0e2955fa7d76ff386c4f"
+SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c"
 SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
 SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
 SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e"
@@ -35,7 +34,8 @@ SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851"
 SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94"
 SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488"
 SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d"
-SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas"
+SRCREV_telemetry = "58e16c257a512ec7f451c9fccf9ff455065b285b"
+SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas_telemetry"
 LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@@ -50,6 +50,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
                    file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \
                    file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \
+                    file://thirdparty/telemetry/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
 "
 inherit cmake python3native pkgconfig qemu
@@ -74,6 +75,7 @@ EXTRA_OECMAKE += " \
                  -DENABLE_SYSTEM_FLATBUFFERS=ON \
                  -DENABLE_SYSTEM_SNAPPY=ON \
                  -DFETCHCONTENT_BASE_DIR="${S}" \
+                  -DENABLE_INTEL_NPU=OFF \
                  "
 DEPENDS += "\
@@ -133,6 +135,7 @@ FILES:${PN}-samples = "${datadir}/openvino \
                       ${libdir}/libformat_reader.a \
                       ${libdir}/libopencv_c_wrapper.a \
                       "
 RDEPENDS:${PN}-samples += "python3-core"
 # Package for inference engine python API
diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb
index 31e9344b..df459d72 100644
--- a/recipes-core/libxcam/libxcam_1.5.0.bb
+++ b/recipes-core/libxcam/libxcam_1.5.0.bb
@@ -30,7 +30,7 @@ PACKAGECONFIG[dnn]    = "--enable-dnn, --disable-dnn,"
 do_install:append () {
    install -d ${D}${bindir}/libxcam
-    cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/
+    cp -r ${B}/tests/.libs/* ${D}${bindir}/libxcam/
 }
 FILES:${PN} += "${libdir}/gstreamer-*/*.so"
diff --git a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
index 825c1f18..195b3c58 100644
--- a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
+++ b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
@@ -1,4 +1,4 @@
-From 8729d66800995a9b7e693bd78249932bd12383e1 Mon Sep 17 00:00:00 2001
+From 683f3552e7d5089601bb37952641b1c7691cf475 Mon Sep 17 00:00:00 2001
 From: John Machado <john.machado@intel.com>
 Date: Mon, 25 Mar 2024 11:13:27 +0530
 Subject: [PATCH] Add new DG2 device IDs (#194)
@@ -11,10 +11,10 @@ Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
 1 file changed, 4 insertions(+)
 diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
-index 7969779..8e2c955 100644
+index 1264087..e944e1e 100644
 --- a/Source/inc/common/igfxfmid.h
 +++ b/Source/inc/common/igfxfmid.h
-@@ -1932,6 +1932,8 @@ typedef enum __NATIVEGTTYPE
+@@ -1934,6 +1934,8 @@ typedef enum __NATIVEGTTYPE
 #define DEV_ID_56BB                             0x56BB
 #define DEV_ID_56BC                             0x56BC
 #define DEV_ID_56BD                             0x56BD
@@ -22,16 +22,13 @@ index 7969779..8e2c955 100644
 +#define DEV_ID_56BF                             0x56BF
 #define DEV_ID_56C0                             0x56C0
 #define DEV_ID_56C1                             0x56C1
- 
+ #define DEV_ID_56C2                             0x56C2
-@@ -1992,6 +1994,8 @@ typedef enum __NATIVEGTTYPE
+@@ -2001,6 +2003,8 @@ typedef enum __NATIVEGTTYPE
                                       ( d == DEV_ID_5690 )                              ||   \
                                       ( d == DEV_ID_5691 )                              ||   \
                                       ( d == DEV_ID_5692 )                              ||   \
 +                                      ( d == DEV_ID_56BE )                              ||   \
 +                                      ( d == DEV_ID_56BF )                              ||   \
                                       ( d == DEV_ID_56C0 )                              ||   \
+                                      ( d == DEV_ID_56C2 )                              ||   \
                                       ( d == DEV_ID_4F80 )                              ||   \
-                                       ( d == DEV_ID_4F81 )                              ||   \
-- 
-2.34.1
diff --git a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch b/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch
deleted file mode 100644
index ab4cb178..00000000
--- a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2b267b72d6aaa922861b120da9c1543161797046 Mon Sep 17 00:00:00 2001
-From: John Machado <john.machado@intel.com>
-Date: Fri, 9 Feb 2024 13:10:18 +0530
-Subject: [PATCH] Introduce ARL-H support (#172)
-Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/544a8be6f66631e085c86c453aafd78b0e7f5179]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- Source/inc/common/igfxfmid.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
-index 99fc624..19aa505 100644
--- a/Source/inc/common/igfxfmid.h
-+++ b/Source/inc/common/igfxfmid.h
-@@ -1966,6 +1966,11 @@ typedef enum __NATIVEGTTYPE
- // ARL-S
- #define DEV_ID_7D67                             0x7D67
- 
-+// ARL-H
-+#define DEV_ID_7D41                             0x7D41
-+#define DEV_ID_7D51                             0x7D51
-+#define DEV_ID_7DD1                             0x7DD1
-+
- #define MGM_HAS     0
- 
- //#define SDG_HAS      1              //Reserve place for Springdale-G HAS
-@@ -2012,6 +2017,11 @@ typedef enum __NATIVEGTTYPE
- // Macro to identify ARL-S Device ID
- #define GFX_IS_ARL_S(d)  ( ( d == DEV_ID_7D67 ) )
- 
-+// Macro to identify ARL-H Device ID
-+#define GFX_IS_ARL_H(d)  ( ( d == DEV_ID_7D41 )  ||   \
-+                         ( d == DEV_ID_7D51 )    ||   \
-+                         ( d == DEV_ID_7DD1 ))
-+
- //we define the highest cap and lower cap of stepping IDs
- #define SI_REV_ID(lo,hi) (lo | hi<<16)
- 
-- 
-2.40.1
diff --git a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb b/recipes-graphics/gmmlib/gmmlib_22.3.18.bb
index 875fbaf5..134a6461 100644
--- a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb
+++ b/recipes-graphics/gmmlib/gmmlib_22.3.18.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654"
 SRC_URI = " \
            git://github.com/intel/gmmlib.git;protocol=https;branch=master \
-            file://0001-Introduce-ARL-H-support-172.patch \
            file://0001-Add-new-DG2-device-IDs-194.patch \
            "
-SRCREV = "5fb4180e22695ad4e3c155cf680119913c9f44bc"
+SRCREV = "ac964bdffdda7730e8234511f61016071e63783b"
 S = "${WORKDIR}/git"
diff --git a/recipes-graphics/libva/libva-intel-utils_2.20.1.bb b/recipes-graphics/libva/libva-intel-utils_2.21.0.bb
index 9c26f009..0407aa18 100644
--- a/recipes-graphics/libva/libva-intel-utils_2.20.1.bb
+++ b/recipes-graphics/libva/libva-intel-utils_2.21.0.bb
@@ -14,8 +14,8 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
-SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https"
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.21-branch;protocol=https"
-SRCREV = "2ad888bb463dc9bfb3deb512ec9faf78f1d3bfa8"
+SRCREV = "5a59217d5d288f7671ca18d3764139289d83a93e"
 S = "${WORKDIR}/git"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
diff --git a/recipes-graphics/libva/libva-intel_2.20.0.bb b/recipes-graphics/libva/libva-intel_2.21.0.bb
index c81ed65c..83fb3646 100644
--- a/recipes-graphics/libva/libva-intel_2.20.0.bb
+++ b/recipes-graphics/libva/libva-intel_2.21.0.bb
@@ -17,11 +17,12 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
-SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 \
+SRC_URI = "git://github.com/intel/libva.git;protocol=https;branch=v2.21-branch \
          "
-SRC_URI[sha256sum] = "f72bdb4f48dfe71ad01f1cbefe069672a2c949a6abd51cf3c4d4784210badc49"
-S = "${WORKDIR}/libva-${PV}"
+SRCREV = "0b01aed44ef1a6ad660261284ff266fa812829ef"
+S = "${WORKDIR}/git"
 UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.171.bb
index 3ed1c9bd..d3f32c25 100644
--- a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb
+++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.171.bb
@@ -8,7 +8,7 @@ SECTION = "lib"
 inherit pkgconfig cmake
 S = "${WORKDIR}/git"
-SRCREV = "75b292eb1309e4ea10dce403065ee8ca5bf29ecc"
+SRCREV = "24c4dfd45df1600ca83dfb03217675edc4633ffd"
 SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \
          "
diff --git a/recipes-multimedia/itt/itt_3.24.6.bb b/recipes-multimedia/itt/itt_3.24.7.bb
index 1c4759f9..481fd5be 100644
--- a/recipes-multimedia/itt/itt_3.24.6.bb
+++ b/recipes-multimedia/itt/itt_3.24.7.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/BSD-3-Clause.txt;md5=c551872bcf41ce707df54c7
                    "
 SRC_URI = "git://github.com/intel/ittapi.git;protocol=https;branch=master"
-SRCREV = "ec077431fc725dba590b09b2cec5137878b14783"
+SRCREV = "e20cd6099cb9c5afee0a285781c5cc1d32412f3e"
 S = "${WORKDIR}/git"
 PE = "1"
diff --git a/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch b/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch
deleted file mode 100644
index 59fff127..00000000
--- a/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bb860c0bfe53060925b1dce50da4e6e94cfc8cae Mon Sep 17 00:00:00 2001
-From: huangli2018 <li.h.huang@intel.com>
-Date: Wed, 20 Dec 2023 15:47:43 +0800
-Subject: [PATCH 04/13] Add device ID for ARL
-Add device ID for ARL
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/95cbfce81cafa3c24d9d4601d41a855093bc51fb]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- .../linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp       | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
-index 426bd795f..7b73dfaff 100644
--- a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
-+++ b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
-@@ -1,6 +1,6 @@
- /*===================== begin_copyright_notice ==================================
- 
-Copyright (c) 2022, Intel Corporation
-+Copyright (c) 2023, Intel Corporation
- 
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
-@@ -218,4 +218,13 @@ static struct GfxDeviceInfo arlInfo = {
- };
- 
- static bool arlsDevice7d67 = DeviceInfoFactory<GfxDeviceInfo>::
-    RegisterDevice(0x7D67, &arlInfo);
-\ No newline at end of file
-+    RegisterDevice(0x7D67, &arlInfo);
-+
-+static bool arlhDevice7d51 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x7D51, &arlInfo);
-+
-+static bool arlhDevice7dd1 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x7DD1, &arlInfo);
-+
-+static bool arlhDevice7d41 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x7D41, &arlInfo);
-\ No newline at end of file
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch b/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch
deleted file mode 100644
index a9cd2317..00000000
--- a/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bbd3af94a6146d702909ff7e25b0c0547ecbb895 Mon Sep 17 00:00:00 2001
-From: jlui <jonathan.ming.jun.lui@intel.com>
-Date: Wed, 15 Nov 2023 10:48:34 +0800
-Subject: [PATCH 05/13] Add XR24 support to DMABuf
-This is to enable XR24/BGRX support for DMABuf
-Signed-off-by: Lui, Jonathan Ming Jun <jonathan.ming.jun.lui@intel.com>
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/3910b7029f5416fd0b5972f940c65d0a82c48c7b]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h         | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
-index fdcca8873..2dcf440a4 100644
--- a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
-+++ b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
-@@ -55,8 +55,9 @@ static ProfileSurfaceAttribInfo surfaceAttribInfo_VAEntrypointVideoProc_VAProfil
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('4', '2', '2', 'V')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'A')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('B', 'G', 'R', 'A')}}},
-    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, { VA_FOURCC('R', 'G', 'B', 'P')}}},
-+    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'P')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'X')}}},
-+    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('X', 'R', 'G', 'B')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('P', '0', '1', '0')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', '2', '4')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_ARGB}}},
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch b/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch
deleted file mode 100644
index 5b04201a..00000000
--- a/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 67fb6128adf8fc03d429393e98f0982b42a40e64 Mon Sep 17 00:00:00 2001
-From: Zhang_Xinfeng <carl.zhang@intel.com>
-Date: Wed, 27 Dec 2023 09:59:29 +0800
-Subject: [PATCH 06/12] add INTEL MEDIA ALLOC refineE to specify the memory
- alignment
-this key is used to allocate bigger pages
-env variable INTEL_MEDIA_ALLOC_refineE also could be used
-and was not enabled by default
-mode 0 is default mode
-mode 1 is < 64 align to 64
-mode 2 is > 1M &&  <= 3M align to 1M, >3M align to 2M
-mode 3 is mode 1 & mode 2
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/765dd939dcc5562d18cca18e5eda505bda952797]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../linux/common/os/i915/mos_bufmgr.c         | 75 +++++++++++++++----
- .../common/os/i915_production/mos_bufmgr.c    |  1 +
- .../common/os/mos_context_specific_next.cpp   | 21 +++++-
- .../common/os/mos_user_setting_specific.cpp   |  7 ++
- 4 files changed, 90 insertions(+), 14 deletions(-)
-diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c
-index c0b3ba027..b623d0129 100644
--- a/media_softlet/linux/common/os/i915/mos_bufmgr.c
-+++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c
-@@ -138,7 +138,7 @@ struct mos_bufmgr_gem {
-     int exec_count;
- 
-     /** Array of lists of cached gem objects of power-of-two sizes */
-    struct mos_gem_bo_bucket cache_bucket[14 * 4];
-+    struct mos_gem_bo_bucket cache_bucket[64];
-     int num_buckets;
-     time_t time;
- 
-@@ -3852,9 +3852,9 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size)
- }
- 
- static void
-init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
-+init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode)
- {
-    unsigned long size, cache_max_size = 64 * 1024 * 1024;
-+    unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size;
- 
-     /* OK, so power of two buckets was too wasteful of memory.
-      * Give 3 other sizes between each power of two, to hopefully
-@@ -3864,17 +3864,63 @@ init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
-      * width/height alignment and rounding of sizes to pages will
-      * get us useful cache hit rates anyway)
-      */
-    add_bucket(bufmgr_gem, 4096);
-    add_bucket(bufmgr_gem, 4096 * 2);
-    add_bucket(bufmgr_gem, 4096 * 3);
-+    /* alloc_mode 0 is default alloc_mode
-+     * alloc_mode 1 rounding up to 64K for all < 1M
-+     * alloc_mode 2 rounding up to 2M for size> 1M
-+     * alloc_mode 3 rounding up to 2M for size > 1M and 64K for size <= 1M */
-+    if( alloc_mode > 3 )
-+        alloc_mode = 0;
-+
-+    if ( 0 == alloc_mode || 2 == alloc_mode)
-+    {
-+        // < 1M normal alloc_mode
-+        add_bucket(bufmgr_gem, 4096);
-+        add_bucket(bufmgr_gem, 4096 * 2);
-+        add_bucket(bufmgr_gem, 4096 * 3);
-+        /* Initialize the linked lists for BO reuse cache. */
-+        for (size = 4 * 4096; size < 1024 * 1024; size *= 2) {
-+            add_bucket(bufmgr_gem, size);
-+            add_bucket(bufmgr_gem, size + size * 1 / 4);
-+            add_bucket(bufmgr_gem, size + size * 2 / 4);
-+            add_bucket(bufmgr_gem, size + size * 3 / 4);
-+        }
- 
-    /* Initialize the linked lists for BO reuse cache. */
-    for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
-        add_bucket(bufmgr_gem, size);
-+        add_bucket(bufmgr_gem, 1024 * 1024);
-+    }
-+    if (1 == alloc_mode || 3 == alloc_mode)
-+    {
-+        // < 1M 64k alignment
-+        unit_size = 64 * 1024;
-+        for (size = unit_size; size <= 1024 * 1024; size += unit_size)
-+        {
-+            add_bucket(bufmgr_gem, size);
-+        }
-+    }
-+    if( 0 == alloc_mode || 1 == alloc_mode)
-+    {
-+       //> 1M is normal alloc_mode
-+        add_bucket(bufmgr_gem, 1280 * 1024);
-+        add_bucket(bufmgr_gem, 1536 * 1024);
-+        add_bucket(bufmgr_gem, 1792 * 1024);
-+
-+        for (size = 2 * 1024 * 1024; size < cache_max_size; size *= 2) {
-+            add_bucket(bufmgr_gem, size);
-+            add_bucket(bufmgr_gem, size + size * 1 / 4);
-+            add_bucket(bufmgr_gem, size + size * 2 / 4);
-+            add_bucket(bufmgr_gem, size + size * 3 / 4);
-+        }
-+    }
-+    if( 2 == alloc_mode || 3 == alloc_mode)
-+    {
-+       //> 1M rolling to 2M
-+       unit_size = 2 * 1024 * 1024;
-+       add_bucket(bufmgr_gem, unit_size);
-+       add_bucket(bufmgr_gem, 3 * 1024 * 1024);
- 
-        add_bucket(bufmgr_gem, size + size * 1 / 4);
-        add_bucket(bufmgr_gem, size + size * 2 / 4);
-        add_bucket(bufmgr_gem, size + size * 3 / 4);
-+       for (size = 4 * 1024 * 1024; size <= cache_max_size; size += unit_size)
-+       {
-+           add_bucket(bufmgr_gem, size);
-+       }
-     }
- }
- 
-@@ -5100,6 +5146,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-     struct drm_i915_gem_get_aperture aperture;
-     drm_i915_getparam_t gp;
-     int ret, tmp;
-+    uint8_t alloc_mode;
-     bool exec2 = false;
- 
-     pthread_mutex_lock(&bufmgr_list_mutex);
-@@ -5352,10 +5399,12 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-      *
-      * Every 4 was too few for the blender benchmark.
-      */
-+    alloc_mode = (uint8_t)(batch_size & 0xff);
-+    batch_size &= 0xffffff00;
-     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
- 
-     DRMINITLISTHEAD(&bufmgr_gem->named);
-    init_cache_buckets(bufmgr_gem);
-+    init_cache_buckets(bufmgr_gem,alloc_mode);
- 
-     DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list);
- 
-diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
-index 90b5685b1..b3574f7d3 100644
--- a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
-+++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
-@@ -5403,6 +5403,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-      *
-      * Every 4 was too few for the blender benchmark.
-      */
-+    batch_size &= 0xffffff00;
-     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
- 
-     DRMINITLISTHEAD(&bufmgr_gem->named);
-diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-index 9e9e3ff7e..543e262d1 100644
--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
-+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-@@ -64,6 +64,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
-     uint32_t      iDeviceId = 0;
-     MOS_STATUS    eStatus   = MOS_STATUS_SUCCESS;
-     uint32_t      value     = 0;
-+    uint32_t      mode      = 0;
-     MediaUserSettingSharedPtr   userSettingPtr = nullptr;
- 
-     MOS_OS_FUNCTION_ENTER;
-@@ -89,7 +90,25 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
- 
-         userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext);
- 
-        m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType);
-+        mode = BATCH_BUFFER_SIZE;
-+        ReadUserSetting(
-+            userSettingPtr,
-+            value,
-+            "INTEL MEDIA ALLOC MODE",
-+            MediaUserSetting::Group::Device);
-+
-+        if (value)
-+        {
-+            mode |= (value & 0x000000ff);
-+        }
-+        value = 0;
-+        /* no need to set batch buffer size after switch to softpin
-+         * keep it, just for test during relocation to softpin transition
-+         * now , it could be a debug method , but is actually useless
-+         * so it is safe to reuse the lowest 8bit to convey addtional information
-+         * more suitable solution is deleting it , or add additional parameter*/
-+
-+        m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType);
-         if (nullptr == m_bufmgr)
-         {
-             MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd);
-diff --git a/media_softlet/linux/common/os/mos_user_setting_specific.cpp b/media_softlet/linux/common/os/mos_user_setting_specific.cpp
-index 6be8b4298..caed584f4 100644
--- a/media_softlet/linux/common/os/mos_user_setting_specific.cpp
-+++ b/media_softlet/linux/common/os/mos_user_setting_specific.cpp
-@@ -52,5 +52,12 @@ MOS_STATUS MosUserSetting::InitMosUserSettingSpecific(MediaUserSettingSharedPtr
-         0,
-         true); //"Enable VM Bind."
- 
-+    DeclareUserSettingKey(
-+        userSettingPtr,
-+        "INTEL MEDIA ALLOC MODE",
-+        MediaUserSetting::Group::Device,
-+        0,
-+        false); //
-+
-     return MOS_STATUS_SUCCESS;
- }
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch b/recipes-multimedia/libva/files/0007-Skip-report-keys.patch
deleted file mode 100644
index 459ff490..00000000
--- a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b1aebef4d342c77fc2b9c5efbf20aeb2aa9d634e Mon Sep 17 00:00:00 2001
-From: Wang_Pingli <pingli.wang@intel.com>
-Date: Thu, 28 Dec 2023 16:44:40 +0800
-Subject: [PATCH 07/12] Skip report keys
-Skip to report keys
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/68ce25b0a6fa90614eb4734c8680aa4e149e8323]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../os/osservice/mos_utilities_specific.cpp   | 30 +++++++++++++++++--
- 1 file changed, 28 insertions(+), 2 deletions(-)
-diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-index b5df29f06..96785e21e 100644
--- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-@@ -67,6 +67,8 @@ int32_t g_mosMemoryFailSimulateAllocCounter = 0;
- int32_t *MosUtilities::m_mosAllocMemoryFailSimulateAllocCounter = &g_mosMemoryFailSimulateAllocCounter;
- #endif
- 
-+static bool s_skipToReportReg = false;
-+
- double MosUtilities::MosGetTime()
- {
-     struct timespec ts = {};
-@@ -1551,6 +1553,10 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
-         {
-             std::string id       = "";
- 
-+            static const char *disableReportRegKeyList[] = {
-+                "INTEL MEDIA ALLOC MODE"
-+            };
-+            static const uint32_t disableReportRegKeyListCount = sizeof(disableReportRegKeyList) / sizeof(disableReportRegKeyList[0]);
-             while(!regStream.eof())
-             {
-                 std::string line = "";
-@@ -1585,8 +1591,22 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
-                     {
-                         std::string name = line.substr(0,pos);
-                         std::string value = line.substr(pos+1);
-                        auto        &keys  = regBufferMap[id];
-                        keys[name]       = value;
-+                        if (name.size() > 0 && value.size() > 0)
-+                        {
-+                            auto &keys = regBufferMap[id];
-+                            keys[name] = value;
-+                            if (s_skipToReportReg == false && id == USER_SETTING_CONFIG_PATH)
-+                            {
-+                                for (uint32_t i = 0; i < disableReportRegKeyListCount; i++)
-+                                {
-+                                    if (strcmp(name.c_str(), disableReportRegKeyList[i]) == 0)
-+                                    {
-+                                        s_skipToReportReg = true;
-+                                        break;
-+                                    }
-+                                }
-+                            }
-+                        }
-                     }
-                 }
-             }
-@@ -1606,6 +1626,12 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
- MOS_STATUS MosUtilities::MosUninitializeReg(RegBufferMap &regBufferMap)
- {
-     MOS_STATUS status = MOS_STATUS_SUCCESS;
-+
-+    if (s_skipToReportReg)
-+    {
-+        return MOS_STATUS_SUCCESS;
-+    }
-+
-     if (regBufferMap.size() == 0)
-     {
-         return MOS_STATUS_SUCCESS;
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch b/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch
deleted file mode 100644
index ece5e00b..00000000
--- a/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From ac2ffac8d4aade216cc361c6c7120c13a8780719 Mon Sep 17 00:00:00 2001
-From: "Soon, Thean Siew" <thean.siew.soon@intel.com>
-Date: Thu, 28 Dec 2023 18:42:59 +0000
-Subject: [PATCH 08/12] Limit INTEL MEDIA ALLOC MODE to MTL and ARL only
-Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754]
-Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com>
---
- .../common/os/i915/include/mos_bufmgr_api.h   |  1 +
- .../common/os/i915/include/mos_bufmgr_priv.h  |  2 +-
- .../linux/common/os/i915/mos_bufmgr.c         | 69 +++++++++++++++----
- .../linux/common/os/i915/mos_bufmgr_api.c     | 19 +++++
- .../os/i915_production/mos_bufmgr_priv.h      |  1 +
- .../common/os/mos_context_specific_next.cpp   | 36 +++++-----
- 6 files changed, 94 insertions(+), 34 deletions(-)
-diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
-index 71cc01099..ab4f1ba89 100644
--- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
-+++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
-@@ -299,6 +299,7 @@ void mos_bufmgr_enable_vmbind(struct mos_bufmgr *bufmgr);
- void mos_bufmgr_disable_object_capture(struct mos_bufmgr *bufmgr);
- int mos_bufmgr_get_memory_info(struct mos_bufmgr *bufmgr, char *info, uint32_t length);
- int mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr);
-+void mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode);
- 
- int mos_bo_map_unsynchronized(struct mos_linux_bo *bo);
- int mos_bo_map_gtt(struct mos_linux_bo *bo);
-diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
-index 63f69f985..6fd58f827 100644
--- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
-+++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
-@@ -358,9 +358,9 @@ struct mos_bufmgr {
-     void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr;
-     int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr;
-     int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr;
-+    void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr;
-     int (*query_engines_count)(struct mos_bufmgr *bufmgr,
-                           unsigned int *nengine) = nullptr;
-    
-     int (*query_engines)(struct mos_bufmgr *bufmgr,
-                           __u16 engine_class,
-                           __u64 caps,
-diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c
-index b623d0129..2814ddbb7 100644
--- a/media_softlet/linux/common/os/i915/mos_bufmgr.c
-+++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c
-@@ -2426,19 +2426,9 @@ mos_gem_bo_start_gtt_access(struct mos_linux_bo *bo, int write_enable)
- }
- 
- static void
-mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
-+mos_bufmgr_cleanup_cache(struct mos_bufmgr_gem *bufmgr_gem)
- {
-    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *) bufmgr;
-    struct drm_gem_close close_bo;
-    int i, ret;
-
-    free(bufmgr_gem->exec2_objects);
-    free(bufmgr_gem->exec_objects);
-    free(bufmgr_gem->exec_bos);
-    pthread_mutex_destroy(&bufmgr_gem->lock);
-
-    /* Free any cached buffer objects we were going to reuse */
-    for (i = 0; i < bufmgr_gem->num_buckets; i++) {
-+    for (int i = 0; i < bufmgr_gem->num_buckets; i++) {
-         struct mos_gem_bo_bucket *bucket =
-             &bufmgr_gem->cache_bucket[i];
-         struct mos_bo_gem *bo_gem;
-@@ -2450,7 +2440,25 @@ mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
- 
-             mos_gem_bo_free(&bo_gem->bo);
-         }
-+        bufmgr_gem->cache_bucket[i].size = 0;
-     }
-+    bufmgr_gem->num_buckets = 0;
-+}
-+
-+static void
-+mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
-+{
-+    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr;
-+    struct drm_gem_close close_bo;
-+    int ret;
-+
-+    free(bufmgr_gem->exec2_objects);
-+    free(bufmgr_gem->exec_objects);
-+    free(bufmgr_gem->exec_bos);
-+    pthread_mutex_destroy(&bufmgr_gem->lock);
-+
-+    /* Free any cached buffer objects we were going to reuse */
-+    mos_bufmgr_cleanup_cache(bufmgr_gem);
- 
-     /* Release userptr bo kept hanging around for optimisation. */
-     if (bufmgr_gem->userptr_active.ptr) {
-@@ -3852,9 +3860,41 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size)
- }
- 
- static void
-init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode)
-+init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
-+{
-+    unsigned long size, cache_max_size = 64 * 1024 * 1024;
-+
-+    /* OK, so power of two buckets was too wasteful of memory.
-+     * Give 3 other sizes between each power of two, to hopefully
-+     * cover things accurately enough.  (The alternative is
-+     * probably to just go for exact matching of sizes, and assume
-+     * that for things like composited window resize the tiled
-+     * width/height alignment and rounding of sizes to pages will
-+     * get us useful cache hit rates anyway)
-+     */
-+    add_bucket(bufmgr_gem, 4096);
-+    add_bucket(bufmgr_gem, 4096 * 2);
-+    add_bucket(bufmgr_gem, 4096 * 3);
-+
-+    /* Initialize the linked lists for BO reuse cache. */
-+    for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
-+        add_bucket(bufmgr_gem, size);
-+
-+        add_bucket(bufmgr_gem, size + size * 1 / 4);
-+        add_bucket(bufmgr_gem, size + size * 2 / 4);
-+        add_bucket(bufmgr_gem, size + size * 3 / 4);
-+    }
-+}
-+
-+static void
-+mos_gem_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode)
- {
-     unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size;
-+    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr;
-+
-+    // Clean up the pre-allocated cache before re-allocating according
-+    // to alloc_mode
-+    mos_bufmgr_cleanup_cache(bufmgr_gem);
- 
-     /* OK, so power of two buckets was too wasteful of memory.
-      * Give 3 other sizes between each power of two, to hopefully
-@@ -5218,6 +5258,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-     bufmgr_gem->bufmgr.disable_object_capture = mos_gem_disable_object_capture;
-     bufmgr_gem->bufmgr.get_memory_info = mos_gem_get_memory_info;
-     bufmgr_gem->bufmgr.get_devid = mos_gem_get_devid;
-+    bufmgr_gem->bufmgr.realloc_cache = mos_gem_realloc_cache;
-     bufmgr_gem->bufmgr.set_context_param = mos_gem_set_context_param;
-     bufmgr_gem->bufmgr.set_context_param_parallel = mos_gem_set_context_param_parallel;
-     bufmgr_gem->bufmgr.set_context_param_load_balance = mos_gem_set_context_param_load_balance;
-@@ -5404,7 +5445,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
- 
-     DRMINITLISTHEAD(&bufmgr_gem->named);
-    init_cache_buckets(bufmgr_gem,alloc_mode);
-+    init_cache_buckets(bufmgr_gem);
- 
-     DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list);
- 
-diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
-index abe8ef96a..d0e02c267 100644
--- a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
-+++ b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
-@@ -1204,6 +1204,25 @@ mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr)
-     }
- }
- 
-+void
-+mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode)
-+{
-+    if(!bufmgr)
-+    {
-+        MOS_OS_CRITICALMESSAGE("Input null ptr\n");
-+        return;
-+    }
-+
-+    if (bufmgr->realloc_cache)
-+    {
-+        return bufmgr->realloc_cache(bufmgr, alloc_mode);
-+    }
-+    else
-+    {
-+        MOS_OS_CRITICALMESSAGE("Unsupported\n");
-+    }
-+}
-+
- int
- mos_query_engines_count(struct mos_bufmgr *bufmgr,
-                       unsigned int *nengine)
-diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
-index c3b765a4c..1d7f7edb0 100644
--- a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
-+++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
-@@ -358,6 +358,7 @@ struct mos_bufmgr {
-     void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr;
-     int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr;
-     int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr;
-+    void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr;
-     int (*query_engines_count)(struct mos_bufmgr *bufmgr,
-                           unsigned int *nengine) = nullptr;
-     
-diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-index 543e262d1..87059f538 100644
--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
-+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-@@ -90,25 +90,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
- 
-         userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext);
- 
-        mode = BATCH_BUFFER_SIZE;
-        ReadUserSetting(
-            userSettingPtr,
-            value,
-            "INTEL MEDIA ALLOC MODE",
-            MediaUserSetting::Group::Device);
-
-        if (value)
-        {
-            mode |= (value & 0x000000ff);
-        }
-        value = 0;
-        /* no need to set batch buffer size after switch to softpin
-         * keep it, just for test during relocation to softpin transition
-         * now , it could be a debug method , but is actually useless
-         * so it is safe to reuse the lowest 8bit to convey addtional information
-         * more suitable solution is deleting it , or add additional parameter*/
-
-        m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType);
-+        m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType);
-         if (nullptr == m_bufmgr)
-         {
-             MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd);
-@@ -151,6 +133,22 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
-             return eStatus;
-         }
- 
-+        if (m_platformInfo.eProductFamily == IGFX_METEORLAKE ||
-+            m_platformInfo.eProductFamily == IGFX_ARROWLAKE)
-+        {
-+            ReadUserSetting(
-+                userSettingPtr,
-+                value,
-+                "INTEL MEDIA ALLOC MODE",
-+                MediaUserSetting::Group::Device);
-+
-+            if (value)
-+            {
-+                mode = (value & 0x000000ff);
-+            }
-+            mos_bufmgr_realloc_cache(m_bufmgr, mode);
-+        }
-+
-         ReadUserSetting(
-             userSettingPtr,
-             value,
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch b/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch
deleted file mode 100644
index 8ee7ef14..00000000
--- a/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 18c32247cbc0e9fabff7a847add099496af9e53f Mon Sep 17 00:00:00 2001
-From: "Soon, Thean Siew" <thean.siew.soon@intel.com>
-Date: Mon, 8 Jan 2024 18:12:30 +0000
-Subject: [PATCH 09/12] Skip cache bucket realloc for default mode 0
-Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754]
-Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com>
---
- .../linux/common/os/mos_context_specific_next.cpp          | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-index 87059f538..9dbd5da79 100644
--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
-+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-@@ -146,7 +146,12 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
-             {
-                 mode = (value & 0x000000ff);
-             }
-            mos_bufmgr_realloc_cache(m_bufmgr, mode);
-+
-+            // Realloc cache only if it's not mode 0
-+            if (mode)
-+            {
-+                mos_bufmgr_realloc_cache(m_bufmgr, mode);
-+            }
-         }
- 
-         ReadUserSetting(
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch b/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch
deleted file mode 100644
index 0100df77..00000000
--- a/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From 7291ab5206c5e172c6c94dcfbe4f1bc258f3b7a5 Mon Sep 17 00:00:00 2001
-From: WenshengZhang <wensheng.zhang@intel.com>
-Date: Wed, 10 Jan 2024 14:08:37 +0800
-Subject: [PATCH 10/12] Fix failed 4k video wall test case and color corruption
- of video composition
-Fix failed 4k video wall test case from 16CH video only show 1CH output and
-corruption observed on certain number of video composition when doing
-sample_multi_transcode.
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/38e14b1b97170b51586d00d1fa607e496b0c5825]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../common/vp/kdll/hal_kerneldll_next.h       |  1 +
- .../vp/hal/packet/vp_render_fc_kernel.cpp     |  7 ++
- .../common/vp/kdll/hal_kerneldll_next.c       | 70 +++++++++++--------
- .../linux/common/vp/ddi/ddi_vp_functions.cpp  | 20 ++----
- 4 files changed, 55 insertions(+), 43 deletions(-)
-diff --git a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
-index 6447999b7..8e2ab371e 100644
--- a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
-+++ b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
-@@ -588,6 +588,7 @@ typedef struct tagKdll_FilterEntry
-     Kdll_Scalingratio      ScalingRatio;
-     Kdll_RenderMethod      RenderMethod;
-     Kdll_SetCSCCoeffMethod SetCSCCoeffMode;
-+    bool                   forceToTargetColorSpace;
- } Kdll_FilterEntry, *PKdll_FilterEntry;
- 
- // Structure that defines a compositing filter
-diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
-index 8e982f67e..f8308fed1 100644
--- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
-+++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
-@@ -775,6 +775,13 @@ MOS_STATUS VpRenderFcKernel::BuildFilter(
- 
-     for (i = 0; (i < (int)compParams->sourceCount) && (iMaxFilterSize > 0); i++)
-     {
-+        if (i > 0)
-+        {
-+            if (!RECT1_CONTAINS_RECT2(compParams->source[0].surf->rcDst, compParams->source[i].surf->rcDst))
-+            {
-+                pFilter->forceToTargetColorSpace = true;
-+            }
-+        }
-         src = &compParams->source[i];
- 
-         //--------------------------------
-diff --git a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
-index d8f7d429a..151f3b039 100644
--- a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
-+++ b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
-@@ -2378,6 +2378,7 @@ bool KernelDll_SetupCSC(
-     Kdll_CSC_Matrix  curr_matrix;
-     Kdll_CSC_Matrix *matrix   = pCSC->Matrix;    // Color Space conversion matrix
-     uint8_t *        matrixID = pCSC->MatrixID;  // CSC coefficient allocation table
-+    bool forceToTargetColorSpace = false;
- 
-     // Clear all CSC matrices
-     MOS_ZeroMemory(matrix, sizeof(pCSC->Matrix));
-@@ -2395,6 +2396,10 @@ bool KernelDll_SetupCSC(
-     //---------------------------------------------------------------//
-     for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
-     {
-+        if (pFilter->forceToTargetColorSpace)
-+        {
-+            forceToTargetColorSpace = true;
-+        }
-         // Disable Procamp for all layers except Main Video
-         // Disable Procamp if source is RGB
-         if (pFilter->layer != Layer_MainVideo ||
-@@ -2456,44 +2461,51 @@ bool KernelDll_SetupCSC(
-     //---------------------------------------------------------------//
-     if (sel_cspace == CSpace_Any)
-     {
-        int cs;
-        for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++)
-+        if (forceToTargetColorSpace)
-         {
-            // Skip color spaces not in use
-            cspace = (VPHAL_CSPACE)cs;
-            if (!cspace_in_use[cspace])
-            {
-                continue;
-            }
-
-            // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I)
-            cspace = KernelDll_TranslateCspace(cspace);
-
-            // Count # of CS conversions and matrices
-            csc_count = 0;
-            for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
-+            sel_cspace = out_cspace;
-+        }
-+        else
-+        {
-+            int cs;
-+            for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++)
-             {
-                // Ignore layers where the Color Space may be set in software (colorfill, palletized)
-                if (pFilter->cspace == CSpace_Any)
-+                // Skip color spaces not in use
-+                cspace = (VPHAL_CSPACE)cs;
-+                if (!cspace_in_use[cspace])
-                 {
-                     continue;
-                 }
- 
-                // Check if CSC/PA is required
-                if (KernelDll_TranslateCspace(pFilter->cspace) != cspace ||
-                    pFilter->procamp != DL_PROCAMP_DISABLED)
-+                // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I)
-+                cspace = KernelDll_TranslateCspace(cspace);
-+
-+                // Count # of CS conversions and matrices
-+                csc_count = 0;
-+                for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
-                 {
-                    csc_count++;
-+                    // Ignore layers where the Color Space may be set in software (colorfill, palletized)
-+                    if (pFilter->cspace == CSpace_Any)
-+                    {
-+                        continue;
-+                    }
-+
-+                    // Check if CSC/PA is required
-+                    if (KernelDll_TranslateCspace(pFilter->cspace) != cspace ||
-+                        pFilter->procamp != DL_PROCAMP_DISABLED)
-+                    {
-+                        csc_count++;
-+                    }
-                 }
-            }
- 
-            // Save best choice as requiring minimum number of CSC operations
-            if ((sel_csc_count < 0) ||                              // Initial value
-                (csc_count < sel_csc_count) ||                      // Minimum number of CSC operations
-                (csc_count == sel_csc_count && cs == main_cspace))  // Use main cspace as default if same CSC count
-            {
-                sel_cspace    = cspace;
-                sel_csc_count = csc_count;
-+                // Save best choice as requiring minimum number of CSC operations
-+                if ((sel_csc_count < 0) ||                              // Initial value
-+                    (csc_count < sel_csc_count) ||                      // Minimum number of CSC operations
-+                    (csc_count == sel_csc_count && cs == main_cspace))  // Use main cspace as default if same CSC count
-+                {
-+                    sel_cspace    = cspace;
-+                    sel_csc_count = csc_count;
-+                }
-             }
-         }
-     }
-diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
-index 40d0b3fad..e60a6c69c 100644
--- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
-+++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
-@@ -2115,9 +2115,8 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill(
- {
-     DDI_VP_FUNC_ENTER;
-     DDI_VP_CHK_NULL(vpHalRenderParams, "nullptr vpHalRenderParams.", VA_STATUS_ERROR_INVALID_PARAMETER);
-    DDI_VP_CHK_NULL(vpHalRenderParams->pTarget[0],"nullptr pTarget[0].", VA_STATUS_ERROR_INVALID_PARAMETER);
- 
-    if ((outBackGroundcolor >> 24) != 0 || vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB)
-+    if ((outBackGroundcolor >> 24) != 0)
-     {
-         if (vpHalRenderParams->pColorFillParams == nullptr)
-         {
-@@ -2126,18 +2125,11 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill(
- 
-         DDI_VP_CHK_NULL(vpHalRenderParams->pColorFillParams, "nullptr pColorFillParams.", VA_STATUS_ERROR_UNKNOWN);
- 
-        if (vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB && (outBackGroundcolor >> 24) == 0)
-        {
-            // set color space for sRGB output
-            vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
-        }
-        else
-        {
-            // set background colorfill option
-            vpHalRenderParams->pColorFillParams->Color   = outBackGroundcolor;
-            vpHalRenderParams->pColorFillParams->bYCbCr  = false;
-            vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
-        }
-+        // set background colorfill option
-+        vpHalRenderParams->pColorFillParams->Color   = outBackGroundcolor;
-+        vpHalRenderParams->pColorFillParams->bYCbCr  = false;
-+        vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
-+
-     }
-     else
-     {
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch b/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch
deleted file mode 100644
index 2f4aec1e..00000000
--- a/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f8b4d982232d4c1330e1e5f5dcd7cd8ca94decba Mon Sep 17 00:00:00 2001
-From: WenshengZhang <wensheng.zhang@intel.com>
-Date: Thu, 25 Jan 2024 16:35:10 +0800
-Subject: [PATCH 11/12] Disable 422H format output
-Disable 422H format output.
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/eab411768e61a46e096793291f5f992eecf76cd8]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../agnostic/common/vp/hal/feature_manager/policy.cpp       | 6 ++++++
- 1 file changed, 6 insertions(+)
-diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
-index 317cec25a..12f1124fa 100644
--- a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
-+++ b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
-@@ -1140,6 +1140,12 @@ MOS_STATUS Policy::GetScalingExecutionCaps(SwFilter *feature, bool isHdrEnabled)
-     bool isAlphaSettingSupportedByVebox =
-         IsAlphaSettingSupportedByVebox(scalingParams->formatInput, scalingParams->formatOutput, scalingParams->pCompAlpha);
- 
-+    if (scalingParams->formatOutput == Format_422H)
-+    {
-+        VP_PUBLIC_ASSERTMESSAGE("Scaling not support 422H format output.");
-+        return MOS_STATUS_UNIMPLEMENTED;
-+    }
-+
-     // Clean usedForNextPass flag.
-     if (scalingEngine->usedForNextPass)
-     {
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch b/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch
deleted file mode 100644
index 1be9139d..00000000
--- a/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b93904533d3ee66c7919fa8e23d26b852a37a917 Mon Sep 17 00:00:00 2001
-From: Lim Siew Hoon <siew.hoon.lim@intel.com>
-Date: Tue, 30 Jan 2024 13:27:52 +0800
-Subject: [PATCH 12/12] [Decode] Fix AVC decode SFC 4K hang issue
-Updated VDSFC input width and height for AVC decode
-Upstream-Status: Submitted [https://github.com/intel-innersource/drivers.gpu.unified/pull/151401]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- .../hal/dec/avc/packet/decode_avc_downsampling_packet.cpp     | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
-index e75fd8137..9cc236bd7 100644
--- a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
-+++ b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
-@@ -59,6 +59,10 @@ MOS_STATUS AvcDownSamplingPkt::InitSfcParams(VDBOX_SFC_PARAMS &sfcParams)
- 
-     AvcBasicFeature *avcBasicFeature = dynamic_cast<AvcBasicFeature*>(m_basicFeature);
-     DECODE_CHK_NULL(avcBasicFeature);
-+
-+    sfcParams.input.width  = avcBasicFeature->m_width;
-+    sfcParams.input.height = avcBasicFeature->m_height;
-+
-     CODEC_PICTURE curPic = avcBasicFeature->m_avcPicParams->CurrPic;
- 
-     if (avcBasicFeature->m_avcPicParams->seq_fields.mb_adaptive_frame_field_flag == true)
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch b/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch
new file mode 100644
index 00000000..17b2d635
--- /dev/null
+++ b/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch
@@ -0,0 +1,154 @@
+From 8aa866dc650e6b0e0b7425bafc7b1039232c377a Mon Sep 17 00:00:00 2001
+From: "Xu, Zhengguo" <zhengguo.xu@intel.com>
+Date: Tue, 16 Apr 2024 09:53:41 +0800
+Subject: [PATCH] [Decode] Correct condition check when dump avc mv buffer
+Fixes: #1791
+Signed-off-by: Xu, Zhengguo <zhengguo.xu@intel.com>
+Upstream-Status: Backport [https://github.com/intel/media-driver/commit/8aa866dc650e6b0e0b7425bafc7b1039232c377a]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ .../common/codec/hal/codechal_decode_avc.cpp  | 33 ++++++++-----------
+ .../decode_avc_picture_xe_m_base_packet.cpp   | 28 +++++++---------
+ .../avc/packet/decode_avc_picture_packet.cpp  | 30 +++++++----------
+ 3 files changed, 37 insertions(+), 54 deletions(-)
+diff --git a/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp b/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp
+index 3adf6994ce..4bac426802 100644
+--- a/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp
+++ b/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp
+@@ -1619,28 +1619,23 @@ MOS_STATUS CodechalDecodeAvc::InitPicMhwParams(
+                 uint8_t picID = picMhwParams->AvcDirectmodeParams.bPicIdRemappingInUse ? i : refList[idx]->ucFrameId;
+                 uint8_t mvIdx = refList[idx]->ucDMVIdx[0];
+ 
+-                if (&picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[i] != nullptr)
+-                {
+-                    // dump Reference mvdata
+-                    std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(i);
+-                    CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer(
+-                        &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[mvIdx],
+-                        CodechalDbgAttr::attrMvData,
+-                        mvBufDumpName.c_str(),
+-                        m_avcDmvBufferSize));
+-                }
+                // dump Reference mvdata
+                std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(i);
+                CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer(
+                    &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[mvIdx],
+                    CodechalDbgAttr::attrMvData,
+                    mvBufDumpName.c_str(),
+                    m_avcDmvBufferSize));
+             }
+         }
+ 
+-        if (&picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx])
+-        {
+-            // dump Current mvdata
+-            CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer(
+-            &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx],
+-                CodechalDbgAttr::attrMvData,
+-                "DEC_Cur_MV_",
+-                m_avcDmvBufferSize));
+-        });
+        // dump Current mvdata
+        CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer(
+        &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx],
+            CodechalDbgAttr::attrMvData,
+            "DEC_Cur_MV_",
+            m_avcDmvBufferSize));
+        );
+ 
+     return eStatus;
+ }
+diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp
+index bd0611f6fa..035a7e6149 100644
+--- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp
+++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp
+@@ -589,26 +589,20 @@ namespace decode{
+         {
+             if (m_avcBasicFeature->m_refFrames.m_avcPicIdx[n].bValid)
+             {
+-                if (&avcDirectmodeParams.presAvcDmvBuffers[n+1] != nullptr)
+-                {
+-                    std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n);
+-                    DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+-                        &avcDirectmodeParams.presAvcDmvBuffers[n+1],
+-                        CodechalDbgAttr::attrMvData,
+-                        mvBufDumpName.c_str(),
+-                        mvBufferSize));
+-                }
+                std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n);
+                DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+                    &avcDirectmodeParams.presAvcDmvBuffers[n+1],
+                    CodechalDbgAttr::attrMvData,
+                    mvBufDumpName.c_str(),
+                    mvBufferSize));
+             }
+         }
+ 
+-        if (&avcDirectmodeParams.presAvcDmvBuffers[0] != nullptr)
+-        {
+-            DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+-                &avcDirectmodeParams.presAvcDmvBuffers[0],
+-                CodechalDbgAttr::attrMvData,
+-                "DEC_Cur_MV_",
+-                mvBufferSize));
+-        }
+        DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+            &avcDirectmodeParams.presAvcDmvBuffers[0],
+            CodechalDbgAttr::attrMvData,
+            "DEC_Cur_MV_",
+            mvBufferSize));
+         return MOS_STATUS_SUCCESS;
+     }
+ 
+diff --git a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp
+index 88ed0bb832..8cdc05e585 100644
+--- a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp
+++ b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp
+@@ -646,26 +646,20 @@ MOS_STATUS AvcDecodePicPkt::DumpResources(uint32_t mvBufferSize) const
+                 CodechalDbgAttr::attrDecodeReferenceSurfaces,
+                 refSurfName.c_str()));
+ 
+-            if (&mvParam.presAvcDmvBuffers[n+1] != nullptr)
+-            {
+-                std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n);
+-                DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+-                    &mvParam.presAvcDmvBuffers[n+1],
+-                    CodechalDbgAttr::attrMvData,
+-                    mvBufDumpName.c_str(),
+-                    mvBufferSize));
+-            }
+            std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n);
+            DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+                &mvParam.presAvcDmvBuffers[n+1],
+                CodechalDbgAttr::attrMvData,
+                mvBufDumpName.c_str(),
+                mvBufferSize));
+         }
+     }
+ 
+-    if (&mvParam.presAvcDmvBuffers[0] != nullptr)
+-    {
+-        DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+-            &mvParam.presAvcDmvBuffers[0],
+-            CodechalDbgAttr::attrMvData,
+-            "DEC_Cur_MV_",
+-            mvBufferSize));
+-    }
+    DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+        &mvParam.presAvcDmvBuffers[0],
+        CodechalDbgAttr::attrMvData,
+        "DEC_Cur_MV_",
+        mvBufferSize));
+ 
+     return MOS_STATUS_SUCCESS;
+ }
+@@ -699,4 +693,4 @@ MOS_STATUS AvcDecodePicPkt::SetSurfaceMmcState() const
+     return MOS_STATUS_SUCCESS;
+ }
+ 
+-}  // namespace decode
+\ No newline at end of file
+}  // namespace decode
diff --git a/recipes-multimedia/libva/intel-media-driver_23.4.3.bb b/recipes-multimedia/libva/intel-media-driver_24.1.5.bb
index 6513d574..79f9887d 100644
--- a/recipes-multimedia/libva/intel-media-driver_23.4.3.bb
+++ b/recipes-multimedia/libva/intel-media-driver_24.1.5.bb
@@ -21,18 +21,10 @@ DEPENDS += "libva gmmlib"
 SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
           file://0001-Disable-vp9-padding-on-mtl.patch \
           file://0002-Force-ARGB-surface-to-tile4-for-ACM.patch \
-           file://0004-Add-device-ID-for-ARL.patch \
+           file://8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch \
-           file://0005-Add-XR24-support-to-DMABuf.patch \
-           file://0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch \
-           file://0007-Skip-report-keys.patch \
-           file://0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch \
-           file://0009-Skip-cache-bucket-realloc-for-default-mode-0.patch \
-           file://0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch \
-           file://0011-Disable-422H-format-output.patch \
-           file://0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch \
          "
-SRCREV = "a9f272496fc0f3e823cc4a814666ea27b443d902"
+SRCREV = "8068c2e119ba16c017e5a5f443fac5a55edbee65"
 S = "${WORKDIR}/git"
 COMPATIBLE_HOST:x86-x32 = "null"
diff --git a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch
deleted file mode 100644
index 8d1f3380..00000000
--- a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a425927469b36e7bc597bff4fdc24d42a1168d1a Mon Sep 17 00:00:00 2001
-From: gfxVPLsdm <gfxvplsdm@intel.com>
-Date: Mon, 18 Dec 2023 09:58:35 +0800
-Subject: [PATCH] ARLH DID open source (#6286)
-Co-authored-by: huangli <li.h.huang@intel.com>
-Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/66f1b4d60a367eb1b0774e0b4369f906e0e632ae]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- _studio/shared/include/mfxstructures-int.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/_studio/shared/include/mfxstructures-int.h b/_studio/shared/include/mfxstructures-int.h
-index 363d9a63..8f16b0a8 100644
--- a/_studio/shared/include/mfxstructures-int.h
-+++ b/_studio/shared/include/mfxstructures-int.h
-@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2021 Intel Corporation
-+// Copyright (c) 2007-2023 Intel Corporation
- //
- // Permission is hereby granted, free of charge, to any person obtaining a copy
- // of this software and associated documentation files (the "Software"), to deal
-@@ -569,6 +569,11 @@ typedef struct {
-     /* ARL S */
-     { 0x7D67, MFX_HW_ARL, MFX_GT2 },
- 
-+    /* ARL H*/
-+    { 0x7D51, MFX_HW_ARL, MFX_GT2 },
-+    { 0x7DD1, MFX_HW_ARL, MFX_GT2 },
-+    { 0x7D41, MFX_HW_ARL, MFX_GT2 },
-+
- };
- 
- /*
-- 
-2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch b/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch
deleted file mode 100644
index 8e014c97..00000000
--- a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e118062518c95d8fb0080cc8276b123a90bd0eb9 Mon Sep 17 00:00:00 2001
-From: gfxVPLsdm <gfxvplsdm@intel.com>
-Date: Wed, 21 Feb 2024 17:11:52 +0800
-Subject: [PATCH] Fix SetBuffersYV12() V & U plane offsets calculation (#6475)
-Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
-Co-authored-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
-Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/ce704ddfe11724767ba86c9425a3917dc3100d4a]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- _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 2cad86f8..fd5fc269 100644
--- a/_studio/shared/src/libmfx_core_vaapi.cpp
-+++ b/_studio/shared/src/libmfx_core_vaapi.cpp
-@@ -462,8 +462,8 @@ public:
-         }
-         else
-         {
-            eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[1] / 2);
-            eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[2] / 2);
-+            eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[0]);
-+            eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[1] / 2);
-         }
-         eb.num_planes = 3;
-         eb.data_size = eb.offsets[2] + (eb.height * eb.pitches[2] / 2);
-- 
-2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch b/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch
deleted file mode 100644
index e3854407..00000000
--- a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 40c0bc6d3dfe172dd25908df2c16de29c34fa4d4 Mon Sep 17 00:00:00 2001
-From: gfxVPLsdm <gfxvplsdm@intel.com>
-Date: Mon, 5 Feb 2024 17:14:07 +0800
-Subject: [PATCH] [JPEGe] Enable BGR4 JPEG Enc support (#6470)
-Co-authored-by: vcheah <vincent.beng.keat.cheah@intel.com>
-Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/e73763d05f8fdc348c356b58dcb83075b5e868f8]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- .../mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp  | 6 ++++--
- .../encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp    | 9 +++++----
- 2 files changed, 9 insertions(+), 6 deletions(-)
-diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
-index 141564b1..332f6372 100644
--- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
-+++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
-@@ -212,7 +212,8 @@ mfxStatus MFXVideoENCODEMJPEG_HW::QueryImplsDescription(
-     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YV12;
-     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YUY2;
-     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_RGB4;
-    memCaps.NumColorFormats = 4;
-+    ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_BGR4;
-+    memCaps.NumColorFormats = 5;
- 
-     ah.PushBack(profileCaps.MemDesc);
-     profileCaps.MemDesc[1] = profileCaps.MemDesc[0];
-@@ -392,7 +393,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Query(VideoCORE * core, mfxVideoParam *in, mfx
-         if ((fourCC == 0 && chromaFormat == 0) ||
-             (fourCC == MFX_FOURCC_NV12 && (chromaFormat == MFX_CHROMAFORMAT_YUV420 || chromaFormat == MFX_CHROMAFORMAT_YUV400)) ||
-             (fourCC == MFX_FOURCC_YUY2 && chromaFormat == MFX_CHROMAFORMAT_YUV422H) ||
-            (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444))
-+            ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444))
-         {
-             out->mfx.FrameInfo.FourCC = in->mfx.FrameInfo.FourCC;
-             out->mfx.FrameInfo.ChromaFormat = in->mfx.FrameInfo.ChromaFormat;
-@@ -698,6 +699,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Init(mfxVideoParam *par)
-             doubleBytesPerPx = 4;
-             break;
-         case MFX_FOURCC_RGB4:
-+        case MFX_FOURCC_BGR4:
-         default:
-             doubleBytesPerPx = 8;
-             break;
-diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
-index 3fc619d1..b1ab556e 100644
--- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
-+++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
-@@ -108,6 +108,7 @@ mfxStatus MfxHwMJpegEncode::CheckJpegParam(VideoCORE *core, mfxVideoParam & par,
-             BytesPerPx = 2;
-             break;
-         case MFX_FOURCC_RGB4:
-+        case MFX_FOURCC_BGR4:
-         default:
-             BytesPerPx = 4;
-     }
-@@ -157,7 +158,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
- 
-     m_payload_base.length = 0;
-     m_payload_list.clear();
-    if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)
-+    if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)  && chromaFormat == MFX_CHROMAFORMAT_YUV444)
-     {
-         m_app14_data.header    = 0xEEFF;//APP14
-         m_app14_data.lenH      = 0;
-@@ -287,7 +288,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
-         m_pps.num_components = 3;
-     else if (fourCC == MFX_FOURCC_NV12 && chromaFormat == MFX_CHROMAFORMAT_YUV400)
-         m_pps.num_components = 1;
-    else if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)
-+    else if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444)
-         m_pps.num_components = 3;
-     else
-         MFX_RETURN(MFX_ERR_UNDEFINED_BEHAVIOR);
-@@ -341,7 +342,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
-     {
-         // No external tables - use Quality parameter
-         m_dqt_list.resize(0);
-        if (fourCC == MFX_FOURCC_RGB4)
-+        if (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)
-         {
-             m_pps.quantiser_table_selector[0] = 0;
-             m_pps.quantiser_table_selector[1] = 0;
-@@ -393,7 +394,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
-         {
-             m_dht_list.resize(0);
-         }
-        else if (hwCaps->MaxNumHuffTable == 1 || fourCC == MFX_FOURCC_RGB4)
-+        else if (hwCaps->MaxNumHuffTable == 1 || (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4))
-         {
-             m_dht_list.resize(1);
- 
-- 
-2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch b/recipes-multimedia/vpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch
index 762a4902..762a4902 100644
--- a/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch
+++ b/recipes-multimedia/vpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch
diff --git a/recipes-multimedia/onevpl/onevpl_2023.4.0.bb b/recipes-multimedia/vpl/libvpl_2.10.2.bb
index 513c7f2c..167e13a5 100644
--- a/recipes-multimedia/onevpl/onevpl_2023.4.0.bb
+++ b/recipes-multimedia/vpl/libvpl_2.10.2.bb
@@ -1,14 +1,14 @@
-SUMMARY = "oneAPI Video Processing Library"
+SUMMARY = "Intel Video Processing Library"
-DESCRIPTION = "The oneAPI Video Processing Library (oneVPL) provides \
+DESCRIPTION = "Intel Video Processing Library (VPL) provides \
 a single video processing API for encode, decode, and video processing \
 that works across a wide range of accelerators."
-HOMEPAGE = "https://github.com/oneapi-src/oneVPL"
+HOMEPAGE = "https://github.com/intel/libvpl"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \
                    file://third-party-programs.txt;md5=0e35a23482445dd089b4eabe19103a06"
-SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https;branch=master \
+SRC_URI = "git://github.com/intel/libvpl.git;protocol=https;branch=master \
           file://0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch \
            "
 SRCREV = "2274efcd3672b43297ef774f332e1fed6781381c"
@@ -21,20 +21,23 @@ PACKAGECONFIG ??= "tools"
 PACKAGECONFIG[tools] = "-DBUILD_TOOLS=ON, -DBUILD_TOOLS=OFF, wayland wayland-native wayland-protocols"
 do_install:append() {
-        mkdir -p ${D}${datadir}/oneVPL/samples
+        mkdir -p ${D}${datadir}/VPL/samples
-        mv ${D}${bindir}/sample_* ${D}${datadir}/oneVPL/samples
+        mv ${D}${bindir}/sample_* ${D}${datadir}/VPL/samples
 }
 COMPATIBLE_HOST = '(x86_64).*-linux'
 PACKAGES =+ "${PN}-examples"
+RREPLACES:${PN} = "onevpl"
+RCONFLICTS:${PN} = "onevpl"
 FILES:${PN}-examples = "${datadir}/vpl \
                       "
 FILES_SOLIBSDEV = ""
 FILES:${PN}-dev += "${libdir}/libvpl.so"
-FILES:${PN} += " ${datadir}/oneVPL/samples  \
+FILES:${PN} += " ${datadir}/VPL/samples  \
                ${libdir}/vpl/libvpl_wayland.so \
                "
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb b/recipes-multimedia/vpl/vpl-gpu-rt_24.1.5.bb
index 0b849bf1..40909a9c 100644
--- a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb
+++ b/recipes-multimedia/vpl/vpl-gpu-rt_24.1.5.bb
@@ -2,8 +2,8 @@ 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"
+HOMEPAGE = "https://github.com/intel/vpl-gpu-rt"
-BUGTRACKER = "https://github.com/oneapi-src/oneVPL-intel-gpu/issues"
+BUGTRACKER = "https://github.com/intel/vpl-gpu-rt/issues"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=eb8cb45b9b57dbaa9fcc9adc4230202b"
@@ -14,16 +14,13 @@ PE = "1"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:x86-x32 = "null"
-DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native"
+DEPENDS += "libdrm libva intel-media-driver libvpl pkgconfig-native"
 RDEPENDS:${PN} += "intel-media-driver"
-SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \
+SRC_URI = "git://github.com/intel/vpl-gpu-rt.git;protocol=https;nobranch=1;lfs=0 \
-           file://0001-ARLH-DID-open-source-6286.patch \
-           file://0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch \
-           file://0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch \
          "
-SRCREV = "852fa9f705ef44c004d014548601f3804a6de705"
+SRCREV = "088db9f5a8164525f00685c72f00a4baed97b90a"
 S = "${WORKDIR}/git"
 FILES:${PN} += " \
@@ -31,3 +28,6 @@ FILES:${PN} += " \
               "
 inherit cmake
+RREPLACES:${PN} = "onevpl-intel-gpu"
+RCONFLICTS:${PN} = "onevpl-intel-gpu"
diff --git a/recipes-support/libipt/libipt_2.1.1.bb b/recipes-support/libipt/libipt_2.1.1.bb
index 205967c1..c4b5ecaa 100644
--- a/recipes-support/libipt/libipt_2.1.1.bb
+++ b/recipes-support/libipt/libipt_2.1.1.bb
@@ -27,7 +27,7 @@ do_install:append() {
    install -d ${D}${bindir}/libipt/tests
    cp -r ${B}/bin/* ${D}${bindir}/libipt/
-    cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests
+    cp -r ${S}/test/src/* ${D}${bindir}/libipt/tests
 }
 FILES:${PN}-test = "${bindir}"