From e49be97def735a54fa2ea8d10debd252c3b21357 Mon Sep 17 00:00:00 2001 From: Nikolaus Rosenmayr Date: Wed, 14 Dec 2022 10:46:13 +0100 Subject: [PATCH] fix(gpu): remove obsolete patch from onevpl-intel-gpu The applied patch has already been imported upstream in version 22.3. So, it can not be applied again and build will fail. Looking at the history of the package `onevpl-intel-gpu` in "meta-intel" layer in yocto repository, it is totally unclear, why this patch has ended up here. It is not needed! Version 22.1 from Feb 2nd 2022 does not include the bad commit, that needs to be reverted. Version 22.3.2 introduced on March 3rd, 2022 already includes the revert commit. Therefore, no version in Yocto contains the bad commit and thus it seems no version check need to be performed with the `.bbappend` file. Hence, the patch is simply removed. see ---- Yocto Kirstone history: https://git.yoctoproject.org/meta-intel/log/recipes-multimedia/onevpl?h=kirkstone upstream import of removed patch https://github.com/oneapi-src/oneVPL-intel-gpu/commit/5650a118aceb0fc098bd503e3ab5969346477a8c Signed-off-by: Nikolaus Rosenmayr --- ...-copy-by-default-on-TGL-RKL-ADL-Linu.patch | 67 ------------------- .../onevpl-intel-gpu_%.bbappend | 2 +- 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 recipes-multimedia/onevpl-intel-gpu/files/0001-Revert-Enable-CM-copy-by-default-on-TGL-RKL-ADL-Linu.patch diff --git a/recipes-multimedia/onevpl-intel-gpu/files/0001-Revert-Enable-CM-copy-by-default-on-TGL-RKL-ADL-Linu.patch b/recipes-multimedia/onevpl-intel-gpu/files/0001-Revert-Enable-CM-copy-by-default-on-TGL-RKL-ADL-Linu.patch deleted file mode 100644 index 6c781b8..0000000 --- a/recipes-multimedia/onevpl-intel-gpu/files/0001-Revert-Enable-CM-copy-by-default-on-TGL-RKL-ADL-Linu.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 47790fd64cfe6b0f2aef87fb7057de1d849e257e Mon Sep 17 00:00:00 2001 -From: Lim Siew Hoon -Date: Wed, 19 Oct 2022 16:08:07 +0800 -Subject: [PATCH] Revert "Enable CM copy by default on TGL/RKL/ADL Linux - (#2939)" - -This reverts commit 5f497951275b2ed1099a570541f8212ca4d4d920. ---- - _studio/shared/include/libmfx_core_vaapi.h | 1 - - _studio/shared/src/libmfx_core_vaapi.cpp | 15 ++++----------- - 2 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/_studio/shared/include/libmfx_core_vaapi.h b/_studio/shared/include/libmfx_core_vaapi.h -index 80ab4f8c..10c441ff 100644 ---- a/_studio/shared/include/libmfx_core_vaapi.h -+++ b/_studio/shared/include/libmfx_core_vaapi.h -@@ -208,7 +208,6 @@ protected: - void ReleaseHandle(); - - bool IsCmSupported(); -- bool IsCmCopyEnabledByDefault(); - mfxStatus TryInitializeCm(); - - std::unique_ptr m_pVA; -diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp -index c76d8474..fb1f6754 100644 ---- a/_studio/shared/src/libmfx_core_vaapi.cpp -+++ b/_studio/shared/src/libmfx_core_vaapi.cpp -@@ -275,13 +275,6 @@ bool VAAPIVideoCORE_T::IsCmSupported() - return GetHWType() < MFX_HW_DG2; - } - --template --bool VAAPIVideoCORE_T::IsCmCopyEnabledByDefault() --{ -- // For Linux by default CM copy is ON on RKL/ADL -- return IsCmSupported() && GetHWType() != MFX_HW_DG1 && GetHWType() != MFX_HW_TGL_LP; --} -- - template - mfxStatus VAAPIVideoCORE_T::TryInitializeCm() - { -@@ -801,8 +794,8 @@ mfxStatus VAAPIVideoCORE_T::DoFastCopyExtended( - return MFX_ERR_UNDEFINED_BEHAVIOR; - } - -- // For Linux, if CM copy is forced to be used, or if choose to use default copy method and CM copy is enabled by default, use CM copy. -- bool canUseCMCopy = (gpuCopyMode & MFX_COPY_USE_CM) && m_pCmCopy && (m_ForcedCmState == MFX_GPUCOPY_ON || (m_ForcedCmState == MFX_GPUCOPY_DEFAULT && IsCmCopyEnabledByDefault())) && CmCopyWrapper::CanUseCmCopy(pDst, pSrc); -+ // For Linux by default CM copy is OFF -+ bool canUseCMCopy = (gpuCopyMode & MFX_COPY_USE_CM) && m_pCmCopy && m_ForcedCmState == MFX_GPUCOPY_ON && CmCopyWrapper::CanUseCmCopy(pDst, pSrc); - - if (NULL != pSrc->Data.MemId && NULL != pDst->Data.MemId) - { -@@ -1294,8 +1287,8 @@ VAAPIVideoCORE_VPL::DoFastCopyExtended( - // check that region of interest is valid - MFX_CHECK(roi.width && roi.height, MFX_ERR_UNDEFINED_BEHAVIOR); - -- // For Linux, if CM copy is forced to be used, or if choose to use default copy method and CM copy is enabled by default, use CM copy. -- bool canUseCMCopy = (gpuCopyMode & MFX_COPY_USE_CM) && m_pCmCopy && (m_ForcedCmState == MFX_GPUCOPY_ON || (m_ForcedCmState == MFX_GPUCOPY_DEFAULT && IsCmCopyEnabledByDefault())) && CmCopyWrapper::CanUseCmCopy(pDst, pSrc); -+ // For Linux by default CM copy is OFF -+ bool canUseCMCopy = (gpuCopyMode & MFX_COPY_USE_CM) && m_pCmCopy && m_ForcedCmState == MFX_GPUCOPY_ON && CmCopyWrapper::CanUseCmCopy(pDst, pSrc); - - if (NULL != pSrc->Data.MemId && NULL != pDst->Data.MemId) - { --- -2.37.2 - diff --git a/recipes-multimedia/onevpl-intel-gpu/onevpl-intel-gpu_%.bbappend b/recipes-multimedia/onevpl-intel-gpu/onevpl-intel-gpu_%.bbappend index 5f5f8c6..4bc60df 100644 --- a/recipes-multimedia/onevpl-intel-gpu/onevpl-intel-gpu_%.bbappend +++ b/recipes-multimedia/onevpl-intel-gpu/onevpl-intel-gpu_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:append = " file://0001-Revert-Enable-CM-copy-by-default-on-TGL-RKL-ADL-Linu.patch \ +SRC_URI:append = " \ file://0001-decode-Fix-no-free-surface-in-decoder-p-3972.patch \ "