Drops patches already merged. * 0001-Expose-the-reg-to-disable-scalability.patch * 0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch
Signed-off-by: Lim Siew Hoon <[email protected]> --- ...xpose-the-reg-to-disable-scalability.patch | 178 ------------------ ...Fix-2pass-CSC-PROCAMP-not-work-issue.patch | 34 ---- ...21.2.3.bb => intel-media-driver_21.3.5.bb} | 4 +- 3 files changed, 1 insertion(+), 215 deletions(-) delete mode 100644 recipes-multimedia/libva/files/0001-Expose-the-reg-to-disable-scalability.patch delete mode 100644 recipes-multimedia/libva/files/0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch rename recipes-multimedia/libva/{intel-media-driver_21.2.3.bb => intel-media-driver_21.3.5.bb} (88%) diff --git a/recipes-multimedia/libva/files/0001-Expose-the-reg-to-disable-scalability.patch b/recipes-multimedia/libva/files/0001-Expose-the-reg-to-disable-scalability.patch deleted file mode 100644 index 03d94314..00000000 --- a/recipes-multimedia/libva/files/0001-Expose-the-reg-to-disable-scalability.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 2cc1938f4692c0310df98726cc03d9d55d52e794 Mon Sep 17 00:00:00 2001 -From: "Xu, Zhengguo" <[email protected]> -Date: Mon, 12 Jul 2021 11:14:53 +0800 -Subject: [PATCH] Expose the reg to disable scalability - -This reg only works in release-internal/debug version. Expose it in release version now. - -This patch was imported from iHD media-driver git server -(https://github.com/intel/media-driver.git) as of pull request -https://github.com/intel/media-driver/pull/1221 - -Upstream-status: Submitted -Signed-off-by: jinchung <[email protected]> ---- - .../agnostic/common/codec/hal/codechal_decode_scalability.cpp | 5 +---- - media_driver/agnostic/common/os/mos_os.h | 3 ++- - media_driver/agnostic/common/os/mos_utilities.cpp | 2 +- - media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h | 5 +---- - .../agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp | 8 +++----- - media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h | 5 +---- - media_driver/linux/common/os/mos_os_specific.c | 2 +- - 7 files changed, 10 insertions(+), 20 deletions(-) - mode change 100644 => 100755 media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp - mode change 100644 => 100755 media_driver/agnostic/common/os/mos_os.h - mode change 100644 => 100755 media_driver/agnostic/common/os/mos_utilities.cpp - mode change 100644 => 100755 media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h - mode change 100644 => 100755 media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp - mode change 100644 => 100755 media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h - mode change 100644 => 100755 media_driver/linux/common/os/mos_os_specific.c - -diff --git a/media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp b/media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp -old mode 100644 -new mode 100755 -index a7719c1..f6d71ef ---- a/media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp -+++ b/media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp -@@ -1968,10 +1968,7 @@ MOS_STATUS CodecHalDecodeScalability_InitializeState ( - vdboxNum = vdboxMfxInterface->GetNumVdbox(); - - if (vdboxNum < 2 --#if (_DEBUG || _RELEASE_INTERNAL) -- || !osInterface->bHcpDecScalabilityMode --#endif -- ) -+ || !osInterface->bHcpDecScalabilityMode) - { - eStatus = MOS_STATUS_INVALID_PARAMETER; - CODECHAL_DECODE_ASSERTMESSAGE("not support scalability on this platform."); -diff --git a/media_driver/agnostic/common/os/mos_os.h b/media_driver/agnostic/common/os/mos_os.h -old mode 100644 -new mode 100755 -index dafa184..f59f1ff ---- a/media_driver/agnostic/common/os/mos_os.h -+++ b/media_driver/agnostic/common/os/mos_os.h -@@ -1406,9 +1406,10 @@ typedef struct _MOS_INTERFACE - #endif // MOS_MEDIASOLO_SUPPORTED - bool VEEnable; - bool bCanEnableSecureRt; -+ -+ int32_t bHcpDecScalabilityMode; //!< enable scalability decode {mode: default, user force, false} - #if (_DEBUG || _RELEASE_INTERNAL) - MOS_FORCE_VEBOX eForceVebox; //!< Force select Vebox -- int32_t bHcpDecScalabilityMode; //!< enable scalability decode {mode: default, user force, false} - int32_t bEnableDbgOvrdInVE; //!< It is for all scalable engines: used together with KMD VE for UMD to specify an engine directly - int32_t bSoftReset; //!< trigger soft reset - #endif // (_DEBUG || _RELEASE_INTERNAL) -diff --git a/media_driver/agnostic/common/os/mos_utilities.cpp b/media_driver/agnostic/common/os/mos_utilities.cpp -old mode 100644 -new mode 100755 -index 74c46e7..15ced88 ---- a/media_driver/agnostic/common/os/mos_utilities.cpp -+++ b/media_driver/agnostic/common/os/mos_utilities.cpp -@@ -3858,7 +3858,7 @@ static MOS_USER_FEATURE_VALUE MOSUserFeatureDescFields[__MOS_USER_FEATURE_KEY_MA - MOS_USER_FEATURE_VALUE_TYPE_BOOL, - "0", - "TRUE for Enabling KMD Virtual Engine Debug Override. (Default FALSE: not override"), -- MOS_DECLARE_UF_KEY_DBGONLY(__MEDIA_USER_FEATURE_VALUE_ENABLE_HCP_SCALABILITY_DECODE_ID, -+ MOS_DECLARE_UF_KEY(__MEDIA_USER_FEATURE_VALUE_ENABLE_HCP_SCALABILITY_DECODE_ID, - "Enable HCP Scalability Decode", - __MEDIA_USER_FEATURE_SUBKEY_INTERNAL, - __MEDIA_USER_FEATURE_SUBKEY_REPORT, -diff --git a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h -old mode 100644 -new mode 100755 -index ca6f30b..79e60b3 ---- a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h -+++ b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h -@@ -119,11 +119,8 @@ public: - m_osInterface = osInterface; - - if (m_numVdbox > 1 --#if (_DEBUG || _RELEASE_INTERNAL) - && m_osInterface != nullptr -- && m_osInterface->bHcpDecScalabilityMode --#endif -- ) -+ && m_osInterface->bHcpDecScalabilityMode) - { - m_scalabilitySupported = true; - } -diff --git a/media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp b/media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp -old mode 100644 -new mode 100755 -index 857397b..6a6d3a8 ---- a/media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp -+++ b/media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp -@@ -927,10 +927,7 @@ MOS_STATUS CodecHalDecodeScalability_InitializeState_G12( - vdboxNum = vdboxMfxInterface->GetNumVdbox(); - - if (vdboxNum < 2 --#if (_DEBUG || _RELEASE_INTERNAL) -- || !osInterface->bHcpDecScalabilityMode --#endif -- ) -+ || !osInterface->bHcpDecScalabilityMode) - { - eStatus = MOS_STATUS_INVALID_PARAMETER; - CODECHAL_DECODE_ASSERTMESSAGE("not support scalability on this platform."); -@@ -1587,13 +1584,14 @@ MOS_STATUS CodecHalDecodeScalability_DecidePipeNum_G12( - bCanEnableRealTile = !(static_cast<PCODECHAL_DECODE_SCALABILITY_STATE_G12>(pScalState))->bDisableRtMode; - if (!pScalStateG12->bEnableRtMultiPhase) - u8MaxTileColumn = 2; -+#endif - if(!bCanEnableScalability - && pOsInterface - && (pOsInterface->bHcpDecScalabilityMode == MOS_SCALABILITY_ENABLE_MODE_USER_FORCE)) - { - bCanEnableScalability = true; - } --#endif -+ - bCanEnableRealTile = bCanEnableRealTile && pInitParamsG12->bIsTileEnabled && (pInitParams->u8NumTileColumns > 1) && - (pInitParams->u8NumTileColumns <= u8MaxTileColumn) && (pInitParams->u8NumTileRows <= HEVC_NUM_MAX_TILE_ROW) && - pInitParamsG12->bHasSubsetParams; -diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h -old mode 100644 -new mode 100755 -index 88f37f2..4af87aa ---- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h -+++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h -@@ -118,11 +118,8 @@ public: - - m_osInterface = osInterface; - if (m_numVdbox > 1 --#if (_DEBUG || _RELEASE_INTERNAL) - && m_osInterface != nullptr -- && m_osInterface->bHcpDecScalabilityMode --#endif -- ) -+ && m_osInterface->bHcpDecScalabilityMode) - { - m_scalabilitySupported = true; - } -diff --git a/media_driver/linux/common/os/mos_os_specific.c b/media_driver/linux/common/os/mos_os_specific.c -old mode 100644 -new mode 100755 -index b07739a..610f2ae ---- a/media_driver/linux/common/os/mos_os_specific.c -+++ b/media_driver/linux/common/os/mos_os_specific.c -@@ -7286,7 +7286,6 @@ static MOS_STATUS Mos_Specific_InitInterface_Ve( - osInterface->bGucSubmission = true; - } - --#if (_DEBUG || _RELEASE_INTERNAL) - //Read Scalable/Legacy Decode mode on Gen11+ - //1:by default for scalable decode mode - //0:for legacy decode mode -@@ -7304,6 +7303,7 @@ static MOS_STATUS Mos_Specific_InitInterface_Ve( - osInterface->bHcpDecScalabilityMode = MOS_SCALABILITY_ENABLE_MODE_USER_FORCE; - } - -+#if (_DEBUG || _RELEASE_INTERNAL) - osInterface->frameSplit = false; - MOS_ZeroMemory(&userFeatureData, sizeof(userFeatureData)); - MOS_UserFeature_ReadValue_ID( --- -2.7.4 - diff --git a/recipes-multimedia/libva/files/0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch b/recipes-multimedia/libva/files/0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch deleted file mode 100644 index ec1dfe56..00000000 --- a/recipes-multimedia/libva/files/0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c7a9e55eb20cbaf12326bdffb57f881febe1e9c2 Mon Sep 17 00:00:00 2001 -From: Jay Yang <[email protected]> -Date: Fri, 2 Jul 2021 10:02:51 +0000 -Subject: [PATCH] [VP] Fix 2pass CSC PROCAMP not work issue - -Enable PROCAMP when 2pass CSC is also enabled. -Fixes: #1138 -Signed off by: [email protected] - -This patch was importaed from iHD media-driver git server -(https://github.com/intel/media-driver.git) as of commit id -06905e60e8aacc86828e79b1431188ba6ed46268 - -Upstream-status: Backport -Signed-off-by: Lim Siew Hoon <[email protected]> ---- - media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp b/media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp -index edea839e..20634286 100644 ---- a/media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp -+++ b/media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp -@@ -2502,6 +2502,7 @@ void VPHAL_VEBOX_STATE::VeboxSetRenderingFlags( - pSrc->ColorSpace != pRenderTarget->ColorSpace); - - pRenderData->bProcamp = ((IS_VPHAL_OUTPUT_PIPE_VEBOX(pRenderData) || -+ pRenderData->b2PassesCSC || - IS_VPHAL_OUTPUT_PIPE_SFC(pRenderData)) && - pSrc->pProcampParams && - pSrc->pProcampParams->bEnabled); --- -2.17.1 - diff --git a/recipes-multimedia/libva/intel-media-driver_21.2.3.bb b/recipes-multimedia/libva/intel-media-driver_21.3.5.bb similarity index 88% rename from recipes-multimedia/libva/intel-media-driver_21.2.3.bb rename to recipes-multimedia/libva/intel-media-driver_21.3.5.bb index fed52120..b7b5727b 100644 --- a/recipes-multimedia/libva/intel-media-driver_21.2.3.bb +++ b/recipes-multimedia/libva/intel-media-driver_21.3.5.bb @@ -19,11 +19,9 @@ REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS += "libva gmmlib" SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ - file://0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch \ - file://0001-Expose-the-reg-to-disable-scalability.patch \ " -SRCREV = "008fb3b400dd906276f999eeaef3f49d52fd3d05" +SRCREV = "ec4dc5d653733c21f8bf390794674052b5abdb09" S = "${WORKDIR}/git" COMPATIBLE_HOST:x86-x32 = "null" -- 2.33.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7318): https://lists.yoctoproject.org/g/meta-intel/message/7318 Mute This Topic: https://lists.yoctoproject.org/mt/86569084/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
