Drops patches already merged: - fd67cc3fbd3a362297afc7cc8d75560df62708de.patch
Rebased patches - 0001-Encode-fix-fwdRefs-array-out-of-bound-issue.patch Add patches fix various issues: - Fixed to force ARGB to tile4 for MTL platform - Fixed to force BGRX to tile4 for MTL platform - Fixed to incorrect VDSFC color issue for MTL platform - To add mocs index in patch list Signed-off-by: Lim Siew Hoon <[email protected]> --- .../files/0001-ARGB-force-to-tile4.patch | 35 +++ ...fix-fwdRefs-array-out-of-bound-issue.patch | 35 --- .../0002-Add-mocs-index-in-patch-list.patch | 31 ++ .../files/0003-fix-vdsfc-csc-issue.patch | 88 ++++++ .../files/0004-XRGB-force-to-tile4.patch | 35 +++ ...cc3fbd3a362297afc7cc8d75560df62708de.patch | 291 ------------------ ...23.1.6.bb => intel-media-driver_23.2.4.bb} | 8 +- 7 files changed, 194 insertions(+), 329 deletions(-) create mode 100644 recipes-multimedia/libva/files/0001-ARGB-force-to-tile4.patch delete mode 100644 recipes-multimedia/libva/files/0001-Encode-fix-fwdRefs-array-out-of-bound-issue.patch create mode 100644 recipes-multimedia/libva/files/0002-Add-mocs-index-in-patch-list.patch create mode 100644 recipes-multimedia/libva/files/0003-fix-vdsfc-csc-issue.patch create mode 100644 recipes-multimedia/libva/files/0004-XRGB-force-to-tile4.patch delete mode 100644 recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch rename recipes-multimedia/libva/{intel-media-driver_23.1.6.bb => intel-media-driver_23.2.4.bb} (85%) diff --git a/recipes-multimedia/libva/files/0001-ARGB-force-to-tile4.patch b/recipes-multimedia/libva/files/0001-ARGB-force-to-tile4.patch new file mode 100644 index 00000000..3ac0685d --- /dev/null +++ b/recipes-multimedia/libva/files/0001-ARGB-force-to-tile4.patch @@ -0,0 +1,35 @@ +From f172dc91c054bb6377b733db12d9210e5f73e7b2 Mon Sep 17 00:00:00 2001 +From: JayYang <[email protected]> +Date: Fri, 7 Jul 2023 13:40:14 +0800 +Subject: [PATCH 1/5] ARGB force to tile4 + +Gmm may create tile64 ARGB surfaces, whereas no tile64 modifier is defined to export such surfaces. +Force ARGB, ABGR, A2RGB10 surfaces to tile4 as WA. + +upstream-status: backport +Backport from upstream intel-media-driver: +https://github.com/intel/media-driver/commit/bd5bde0d8a0c0a6672c3586ee6727eff3ca9bc21 +--- + media_softlet/linux/common/ddi/media_libva_util_next.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp +index e3c49eef8..1852e59d2 100644 +--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp ++++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp +@@ -647,6 +647,12 @@ VAStatus MediaLibvaUtilNext::GenerateGmmParamsForInternalSurface( + } + } + } ++ // For ARGB surface, always allocate it as tile4. ++ // This is a WA for ExportSurfaceHandle because modifer for tile64 isn't defined. ++ if ((params.format == Media_Format_A8R8G8B8 || params.format == Media_Format_B10G10R10A2 || params.format == Media_Format_A8B8G8R8) && !MEDIA_IS_SKU(&mediaDrvCtx->SkuTable, FtrTileY)) ++ { ++ gmmParams.Flags.Info.Tile4 = true; ++ } + break; + case I915_TILING_X: + gmmParams.Flags.Info.TiledX = true; +-- +2.40.1 + diff --git a/recipes-multimedia/libva/files/0001-Encode-fix-fwdRefs-array-out-of-bound-issue.patch b/recipes-multimedia/libva/files/0001-Encode-fix-fwdRefs-array-out-of-bound-issue.patch deleted file mode 100644 index 7367808d..00000000 --- a/recipes-multimedia/libva/files/0001-Encode-fix-fwdRefs-array-out-of-bound-issue.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e8bb025cd56c269adf3ffdc3dda404505974f676 Mon Sep 17 00:00:00 2001 -From: bai-isaac <[email protected]> -Date: Mon, 12 Jun 2023 12:44:29 +0800 -Subject: [PATCH] [Encode] fix fwdRefs array out of bound issue - -fix fwdRefs array out of bound issue. - -Upstream-Status: Backport [https://github.com/intel/media-driver/commit/d795297127488b328f1cc260cf5da66debf95b99] -Expect it to be removed once move to intel-media-23.2.4 or above - -Signed-off-by: Ch'ng, Seng Guan <[email protected]> ---- - media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_impl.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_impl.h b/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_impl.h -index 3b79f4886..85a5a4127 100644 ---- a/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_impl.h -+++ b/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_impl.h -@@ -649,10 +649,11 @@ protected: - &resourceParams)); - } - -+ // SCC will use BwdRef0 as extra slot to store IBC if max fwd ref num is 3. - typename cmd_t::VDENC_Reference_Picture_CMD *fwdRefs[] = - {&cmd.FwdRef0, &cmd.FwdRef1, &cmd.FwdRef2, &cmd.BwdRef0}; - uint32_t fwdRefsDwLoaction[] = -- {_MHW_CMD_DW_LOCATION(FwdRef0), _MHW_CMD_DW_LOCATION(FwdRef1), _MHW_CMD_DW_LOCATION(FwdRef2)}; -+ {_MHW_CMD_DW_LOCATION(FwdRef0), _MHW_CMD_DW_LOCATION(FwdRef1), _MHW_CMD_DW_LOCATION(FwdRef2), _MHW_CMD_DW_LOCATION(BwdRef0)}; - - typename cmd_t::VDENC_Down_Scaled_Reference_Picture_CMD *fwdRefsDsStage1[] = - {&cmd.DsFwdRef0, &cmd.DsFwdRef1}; --- -2.40.1 - diff --git a/recipes-multimedia/libva/files/0002-Add-mocs-index-in-patch-list.patch b/recipes-multimedia/libva/files/0002-Add-mocs-index-in-patch-list.patch new file mode 100644 index 00000000..756d47d9 --- /dev/null +++ b/recipes-multimedia/libva/files/0002-Add-mocs-index-in-patch-list.patch @@ -0,0 +1,31 @@ +From 80c5c6e6e671d61eae16a53fd36442993813609f Mon Sep 17 00:00:00 2001 +From: LeyuYao <[email protected]> +Date: Mon, 3 Jul 2023 00:58:09 +0800 +Subject: [PATCH 2/5] Add mocs index in patch list + +For linux usage + +upstream-status: backport + +Backport from upstream media-driver: +https://github.com/intel/media-driver/commit/26d5f57cad88df823164944ad496507d22a50fb1 +--- + media_softlet/agnostic/common/hw/mhw_utilities_next.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/media_softlet/agnostic/common/hw/mhw_utilities_next.cpp b/media_softlet/agnostic/common/hw/mhw_utilities_next.cpp +index a9db7bf95..4db4e1f66 100644 +--- a/media_softlet/agnostic/common/hw/mhw_utilities_next.cpp ++++ b/media_softlet/agnostic/common/hw/mhw_utilities_next.cpp +@@ -290,6 +290,8 @@ MOS_STATUS Mhw_AddResourceToCmd_PatchList( + // Offset and command LSB parameters + dwOffset = pParams->dwOffset | ((*pParams->pdwCmd) & ((1 << dwLsbNum) - 1)); + ++ Mhw_SetMocsTableIndex(pOsInterface, pParams->presResource, pParams->mocsParams); ++ + if (pParams->dwOffsetInSSH > 0) + { + // Calculate the patch offset to command buffer +-- +2.40.1 + diff --git a/recipes-multimedia/libva/files/0003-fix-vdsfc-csc-issue.patch b/recipes-multimedia/libva/files/0003-fix-vdsfc-csc-issue.patch new file mode 100644 index 00000000..f0d3d55d --- /dev/null +++ b/recipes-multimedia/libva/files/0003-fix-vdsfc-csc-issue.patch @@ -0,0 +1,88 @@ +From e4f88d8a7fbde1df022a648e2cd06c1b8abbd4e4 Mon Sep 17 00:00:00 2001 +From: shawnli2 <[email protected]> +Date: Sun, 25 Jun 2023 15:25:11 +0800 +Subject: [PATCH 3/5] fix vdsfc csc issue + +to support ARGB8 output, need to enable csc from YUV to RGB + +upstream-status: backport +Backport from upstream media-driver: +https://github.com/intel/media-driver/commit/9806aede1724d5eea3a8ddb262d1f2cbcca63456 +--- + .../Xe_XPM_base/vp/hal/packet/vp_render_sfc_xe_xpm_base.cpp | 5 +++-- + .../common/vp/hal/packet/vp_render_sfc_base_legacy.cpp | 4 ++-- + .../vp/hal/packet/vp_render_sfc_xe_lpm_plus_base.cpp | 5 +++-- + .../agnostic/common/vp/hal/packet/vp_render_sfc_base.cpp | 4 ++-- + 4 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/vp/hal/packet/vp_render_sfc_xe_xpm_base.cpp b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/vp/hal/packet/vp_render_sfc_xe_xpm_base.cpp +index 24bade3fd..daccd21f0 100644 +--- a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/vp/hal/packet/vp_render_sfc_xe_xpm_base.cpp ++++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/vp/hal/packet/vp_render_sfc_xe_xpm_base.cpp +@@ -298,9 +298,10 @@ bool SfcRenderXe_Xpm_Base::IsOutputChannelSwapNeeded(MOS_FORMAT outputFormat) + bool SfcRenderXe_Xpm_Base::IsCscNeeded(SFC_CSC_PARAMS &cscParams) + { + VP_FUNC_CALL(); +- if (m_bVdboxToSfc && m_videoConfig.codecStandard == CODECHAL_JPEG) ++ ++ if (m_bVdboxToSfc && cscParams.inputFormat != cscParams.outputFormat) + { +- if (cscParams.inputFormat != cscParams.outputFormat) ++ if (m_videoConfig.codecStandard == CODECHAL_JPEG || cscParams.outputFormat == Format_A8R8G8B8) + { + return true; + } +diff --git a/media_driver/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base_legacy.cpp b/media_driver/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base_legacy.cpp +index 16cef55b3..19c99364b 100644 +--- a/media_driver/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base_legacy.cpp ++++ b/media_driver/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base_legacy.cpp +@@ -197,10 +197,10 @@ MOS_STATUS SfcRenderBaseLegacy::SetIefStateCscParams( + { + psfcStateParams->bCSCEnable = true; + pIEFStateParams->bCSCEnable = true; +- if (m_bVdboxToSfc && m_videoConfig.codecStandard == CODECHAL_JPEG) ++ if (m_bVdboxToSfc) + { + m_cscInputSwapNeeded = false; +- if (m_videoConfig.jpeg.jpegChromaType == jpegRGB) ++ if (m_videoConfig.jpeg.jpegChromaType == jpegRGB && m_videoConfig.codecStandard == CODECHAL_JPEG) + { + m_cscCoeff[0] = 1.000000000f; + m_cscCoeff[1] = 0.000000000f; +diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/vp/hal/packet/vp_render_sfc_xe_lpm_plus_base.cpp b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/vp/hal/packet/vp_render_sfc_xe_lpm_plus_base.cpp +index 304fd2ffc..e9737c3c5 100644 +--- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/vp/hal/packet/vp_render_sfc_xe_lpm_plus_base.cpp ++++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/vp/hal/packet/vp_render_sfc_xe_lpm_plus_base.cpp +@@ -636,9 +636,10 @@ bool SfcRenderXe_Lpm_Plus_Base::IsOutputChannelSwapNeeded(MOS_FORMAT outputForma + bool SfcRenderXe_Lpm_Plus_Base::IsCscNeeded(SFC_CSC_PARAMS &cscParams) + { + VP_FUNC_CALL(); +- if (m_bVdboxToSfc && m_videoConfig.codecStandard == CODECHAL_JPEG) ++ ++ if (m_bVdboxToSfc && cscParams.inputFormat != cscParams.outputFormat) + { +- if (cscParams.inputFormat != cscParams.outputFormat) ++ if (m_videoConfig.codecStandard == CODECHAL_JPEG || cscParams.outputFormat == Format_A8R8G8B8) + { + return true; + } +diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base.cpp +index 573a0a12d..2b7c5231a 100644 +--- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base.cpp ++++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base.cpp +@@ -238,10 +238,10 @@ MOS_STATUS SfcRenderBase::SetIefStateCscParams( + { + psfcStateParams->bCSCEnable = true; + pIEFStateParams->bCSCEnable = true; +- if (m_bVdboxToSfc && m_videoConfig.codecStandard == CODECHAL_JPEG) ++ if (m_bVdboxToSfc) + { + m_cscInputSwapNeeded = false; +- if (m_videoConfig.jpeg.jpegChromaType == jpegRGB) ++ if (m_videoConfig.jpeg.jpegChromaType == jpegRGB && m_videoConfig.codecStandard == CODECHAL_JPEG) + { + m_cscCoeff[0] = 1.000000000f; + m_cscCoeff[1] = 0.000000000f; +-- +2.40.1 + diff --git a/recipes-multimedia/libva/files/0004-XRGB-force-to-tile4.patch b/recipes-multimedia/libva/files/0004-XRGB-force-to-tile4.patch new file mode 100644 index 00000000..16b2961e --- /dev/null +++ b/recipes-multimedia/libva/files/0004-XRGB-force-to-tile4.patch @@ -0,0 +1,35 @@ +From bd96cac9a35a8ca98c7e2b8f622afb75f31ed221 Mon Sep 17 00:00:00 2001 +From: JayYang <[email protected]> +Date: Thu, 27 Jul 2023 21:05:50 +0800 +Subject: [PATCH 4/5] XRGB force to tile4 + +Force BGRX surfaces to tile4 because glimagesink plugins backend support by 3D mesa +driver is reporting back the XR24 (BGRx) for dmabuf modifier case is 0x0100000000000009 + +upstream-status: backport + +Backport from upstream media-driver: +https://github.com/intel/media-driver/commit/b6d038491372f39330b33620ed8bdb8255b57a66 +--- + media_softlet/linux/common/ddi/media_libva_util_next.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp +index 1852e59d2..b31607945 100644 +--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp ++++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp +@@ -649,7 +649,10 @@ VAStatus MediaLibvaUtilNext::GenerateGmmParamsForInternalSurface( + } + // For ARGB surface, always allocate it as tile4. + // This is a WA for ExportSurfaceHandle because modifer for tile64 isn't defined. +- if ((params.format == Media_Format_A8R8G8B8 || params.format == Media_Format_B10G10R10A2 || params.format == Media_Format_A8B8G8R8) && !MEDIA_IS_SKU(&mediaDrvCtx->SkuTable, FtrTileY)) ++ if ((params.format == Media_Format_A8R8G8B8 || ++ params.format == Media_Format_B10G10R10A2 || ++ params.format == Media_Format_A8B8G8R8 || ++ params.format == Media_Format_X8R8G8B8) && !MEDIA_IS_SKU(&mediaDrvCtx->SkuTable, FtrTileY)) + { + gmmParams.Flags.Info.Tile4 = true; + } +-- +2.40.1 + diff --git a/recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch b/recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch deleted file mode 100644 index 94b15c69..00000000 --- a/recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch +++ /dev/null @@ -1,291 +0,0 @@ -From fd67cc3fbd3a362297afc7cc8d75560df62708de Mon Sep 17 00:00:00 2001 -From: Jay Yang <[email protected]> -Date: Fri, 21 Apr 2023 13:10:52 +0800 -Subject: [PATCH] Fix GCC13 build errors - -Fix #1639 -Fix #1640 -Fix #1641 -Signed-off-by: Jay Yang <[email protected]> - -Upstream-Status: Submitted -Signed-off-by: Anuj Mittal <[email protected]> ---- - .../Xe_M/Xe_XPM/hw/mhw_vebox_xe_xpm.h | 21 +++++++++++-------- - .../hal/codechal_encode_csc_ds_mdf_g12.h | 1 + - .../agnostic/gen12/hw/mhw_vebox_g12_X.h | 1 + - .../gen12/hw/vdbox/mhw_vdbox_avp_generic.h | 19 ----------------- - .../gen9/codec/hal/codechal_encode_avc_g9.h | 1 + - .../codec/hal/codechal_fei_hevc_g9_skl.cpp | 3 --- - .../shared/mediacopy/media_copy_xe_hpm.h | 1 + - .../shared/mediacopy/media_copy_xe_xpm_base.h | 1 + - .../shared/mediacopy/media_copy_xe_xpm_plus.h | 1 + - .../hucitf/decode_huc_packet_creator_g12.h | 4 ++++ - .../m12_0/shared/mediacopy/media_copy_m12_0.h | 1 + - .../mediacopy/media_copy_xe_lpm_plus_base.h | 1 + - .../bufferMgr/encode_tracked_buffer_queue.cpp | 5 +++++ - .../bufferMgr/encode_tracked_buffer_queue.h | 2 +- - .../common/shared/media_debug_serializer.h | 1 + - .../media_scalability_multipipe.cpp | 2 +- - .../scalability/media_scalability_multipipe.h | 2 +- - 17 files changed, 33 insertions(+), 34 deletions(-) - -diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_xe_xpm.h b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_xe_xpm.h -index b6b86a54ed..ae9a4be096 100644 ---- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_xe_xpm.h -+++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_xe_xpm.h -@@ -110,15 +110,6 @@ class MhwVeboxInterfaceXe_Xpm: public MhwVeboxInterfaceG12 - PMOS_COMMAND_BUFFER pCmdBuffer, - PMHW_VEBOX_SURFACE_STATE_CMD_PARAMS pVeboxSurfaceStateCmdParams) override; - -- void SetVeboxSurfaces( -- PMHW_VEBOX_SURFACE_PARAMS pSurfaceParam, -- PMHW_VEBOX_SURFACE_PARAMS pDerivedSurfaceParam, -- PMHW_VEBOX_SURFACE_PARAMS pSkinScoreSurfaceParam, -- mhw_vebox_xe_xpm::VEBOX_SURFACE_STATE_CMD *pVeboxSurfaceState, -- bool bIsOutputSurface, -- bool bDIEnable, -- bool b3DlutEnable); -- - MOS_STATUS FindVeboxGpuNodeToUse( - PMHW_VEBOX_GPUNODE_LIMIT pGpuNodeLimit) override; - -@@ -144,6 +135,18 @@ class MhwVeboxInterfaceXe_Xpm: public MhwVeboxInterfaceG12 - uint32_t m_indexofVebox = 0; - uint32_t m_numofVebox = 1; - uint32_t m_usingSfc = 0; -+ -+ using MhwVeboxInterfaceG12::SetVeboxSurfaces; -+ -+ void SetVeboxSurfaces( -+ PMHW_VEBOX_SURFACE_PARAMS pSurfaceParam, -+ PMHW_VEBOX_SURFACE_PARAMS pDerivedSurfaceParam, -+ PMHW_VEBOX_SURFACE_PARAMS pSkinScoreSurfaceParam, -+ mhw_vebox_xe_xpm::VEBOX_SURFACE_STATE_CMD *pVeboxSurfaceState, -+ bool bIsOutputSurface, -+ bool bDIEnable, -+ bool b3DlutEnable); -+ - }; - - #endif // __MHW_VEBOX_XE_XPM_H__ -diff --git a/media_driver/agnostic/gen12/codec/hal/codechal_encode_csc_ds_mdf_g12.h b/media_driver/agnostic/gen12/codec/hal/codechal_encode_csc_ds_mdf_g12.h -index 3dd276a748..ce21993da7 100644 ---- a/media_driver/agnostic/gen12/codec/hal/codechal_encode_csc_ds_mdf_g12.h -+++ b/media_driver/agnostic/gen12/codec/hal/codechal_encode_csc_ds_mdf_g12.h -@@ -202,6 +202,7 @@ class CodechalEncodeCscDsMdfG12 : public CodechalEncodeCscDsG12 - - MOS_STATUS CscKernel( - KernelParams* pParams) override; -+ using CodechalEncodeCscDsG12::InitKernelStateCsc; - MOS_STATUS InitKernelStateCsc(KernelParams* pParams); - MOS_STATUS SetupKernelArgsCSC(CmKernel *cmKrnCSCDS, SurfaceParamsCscMdf* surfaceparams); - MOS_STATUS SetCurbeCscforMDF(CMRT_UMD::vector<uint32_t, 10> & curbeData); -diff --git a/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h b/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h -index 64e2ffe462..d0c2d6ca5e 100644 ---- a/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h -+++ b/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h -@@ -336,6 +336,7 @@ class MhwVeboxInterfaceG12 : public MhwVeboxInterfaceGeneric<mhw_vebox_g12_X> - MOS_STATUS ValidateVeboxScalabilityConfig(); - #endif - -+protected: - void SetVeboxSurfaces( - PMHW_VEBOX_SURFACE_PARAMS pSurfaceParam, - PMHW_VEBOX_SURFACE_PARAMS pDerivedSurfaceParam, -diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_generic.h b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_generic.h -index ae1bd88cb2..fb2fc0fe86 100644 ---- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_generic.h -+++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_generic.h -@@ -95,24 +95,5 @@ class MhwVdboxAvpInterfaceGeneric : public MhwVdboxAvpInterface - - return eStatus; - } -- -- MOS_STATUS AddAvpBsdObjectCmd( -- PMOS_COMMAND_BUFFER cmdBuffer, -- MhwVdboxAvpBsdParams *params) -- { -- MOS_STATUS eStatus = MOS_STATUS_SUCCESS; -- -- MHW_FUNCTION_ENTER; -- MHW_MI_CHK_NULL(m_osInterface); -- -- typename TAvpCmds::AVP_BSD_OBJECT_CMD cmd; -- -- cmd.DW1.IndirectBsdDataLength = params->m_bsdDataLength; -- cmd.DW2.IndirectDataStartAddress = params->m_bsdDataStartOffset; -- -- MHW_MI_CHK_STATUS(m_osInterface->pfnAddCommand(cmdBuffer, &cmd, sizeof(cmd))); -- -- return eStatus; -- } - }; - #endif -diff --git a/media_driver/agnostic/gen9/codec/hal/codechal_encode_avc_g9.h b/media_driver/agnostic/gen9/codec/hal/codechal_encode_avc_g9.h -index f981860946..a735bb46cf 100644 ---- a/media_driver/agnostic/gen9/codec/hal/codechal_encode_avc_g9.h -+++ b/media_driver/agnostic/gen9/codec/hal/codechal_encode_avc_g9.h -@@ -5668,6 +5668,7 @@ class CodechalEncodeAvcEncG9 : public CodechalEncodeAvcEnc - MOS_STATUS GetStatusReport( - void *status, - uint16_t numStatus) override; -+ using CodechalEncodeAvcEnc::GetStatusReport; - - #if USE_CODECHAL_DEBUG_TOOL - protected: -diff --git a/media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.cpp b/media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.cpp -index 8da01da3f0..59c0480653 100644 ---- a/media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.cpp -+++ b/media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.cpp -@@ -6410,9 +6410,6 @@ MOS_STATUS CodechalFeiHevcStateG9Skl::FreeEncResources() - - m_cmKernelMap.clear(); - -- CmKernelMapType deallocator; -- m_cmKernelMap.swap(deallocator); -- - #endif - - return eStatus; -diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/shared/mediacopy/media_copy_xe_hpm.h b/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/shared/mediacopy/media_copy_xe_hpm.h -index b43087e93c..23bf56075c 100644 ---- a/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/shared/mediacopy/media_copy_xe_hpm.h -+++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/shared/mediacopy/media_copy_xe_hpm.h -@@ -50,6 +50,7 @@ class MediaCopyState_Xe_Hpm: public MediaCopyBaseState - //! - //! \brief init function. - virtual MOS_STATUS Initialize( PMOS_INTERFACE osInterface, MhwInterfaces *mhwInterfaces); -+ using MediaCopyBaseState::Initialize; - - //! - //! \brief render format support. -diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/shared/mediacopy/media_copy_xe_xpm_base.h b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/shared/mediacopy/media_copy_xe_xpm_base.h -index 8075553c0d..14c291a4a1 100644 ---- a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/shared/mediacopy/media_copy_xe_xpm_base.h -+++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/shared/mediacopy/media_copy_xe_xpm_base.h -@@ -49,6 +49,7 @@ class MediaCopyStateXe_Xpm_Base: public MediaCopyBaseState - //! - //! \brief init function. - virtual MOS_STATUS Initialize( PMOS_INTERFACE osInterface, MhwInterfaces *mhwInterfaces); -+ using MediaCopyBaseState::Initialize; - - //! - //! \brief surface copy pre process. -diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_plus/shared/mediacopy/media_copy_xe_xpm_plus.h b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_plus/shared/mediacopy/media_copy_xe_xpm_plus.h -index 99f7bfe525..e24f42963f 100644 ---- a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_plus/shared/mediacopy/media_copy_xe_xpm_plus.h -+++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_plus/shared/mediacopy/media_copy_xe_xpm_plus.h -@@ -50,6 +50,7 @@ class MediaCopyStateXe_Xpm_Plus: public MediaCopyBaseState - //! - //! \brief init function. - virtual MOS_STATUS Initialize(PMOS_INTERFACE osInterface, MhwInterfaces *mhwInterfaces); -+ using MediaCopyBaseState::Initialize; - - //! - //! \brief render format support. -diff --git a/media_driver/media_softlet/agnostic/gen12_base/codec/hal/dec/shared/hucitf/decode_huc_packet_creator_g12.h b/media_driver/media_softlet/agnostic/gen12_base/codec/hal/dec/shared/hucitf/decode_huc_packet_creator_g12.h -index 682c9352bd..1774ff6dcf 100644 ---- a/media_driver/media_softlet/agnostic/gen12_base/codec/hal/dec/shared/hucitf/decode_huc_packet_creator_g12.h -+++ b/media_driver/media_softlet/agnostic/gen12_base/codec/hal/dec/shared/hucitf/decode_huc_packet_creator_g12.h -@@ -48,6 +48,10 @@ class HucPacketCreatorG12 : public HucPacketCreatorBase - MediaPipeline *pipeline, - MediaTask *task, - CodechalHwInterface *hwInterface); -+ -+ using HucPacketCreatorBase::CreateHucCopyPkt; -+ using HucPacketCreatorBase::CreateProbUpdatePkt; -+ using HucPacketCreatorBase::CreateStreamOutInterface; - MEDIA_CLASS_DEFINE_END(decode__HucPacketCreatorG12) - }; - -diff --git a/media_driver/media_softlet/agnostic/m12/m12_0/shared/mediacopy/media_copy_m12_0.h b/media_driver/media_softlet/agnostic/m12/m12_0/shared/mediacopy/media_copy_m12_0.h -index 25e5972b7d..7e267011ad 100644 ---- a/media_driver/media_softlet/agnostic/m12/m12_0/shared/mediacopy/media_copy_m12_0.h -+++ b/media_driver/media_softlet/agnostic/m12/m12_0/shared/mediacopy/media_copy_m12_0.h -@@ -51,6 +51,7 @@ class MediaCopyStateM12_0: public MediaCopyBaseState - //! - //! \brief init function. - virtual MOS_STATUS Initialize( PMOS_INTERFACE osInterface, MhwInterfaces *mhwInterfaces); -+ using MediaCopyBaseState::Initialize; - - //! - //! \brief render format support. -diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/shared/mediacopy/media_copy_xe_lpm_plus_base.h b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/shared/mediacopy/media_copy_xe_lpm_plus_base.h -index 1f3c14ff44..5775a81732 100644 ---- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/shared/mediacopy/media_copy_xe_lpm_plus_base.h -+++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/shared/mediacopy/media_copy_xe_lpm_plus_base.h -@@ -48,6 +48,7 @@ class MediaCopyStateXe_Lpm_Plus_Base: public MediaCopyBaseState - //! - //! \brief init function. - virtual MOS_STATUS Initialize(PMOS_INTERFACE osInterface, MhwInterfacesNext *mhwInterfaces); -+ using MediaCopyBaseState::Initialize; - - //! - //! \brief render format support. -diff --git a/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.cpp b/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.cpp -index ccd75e3d97..5c53583b02 100644 ---- a/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.cpp -+++ b/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.cpp -@@ -154,4 +154,9 @@ MOS_STATUS BufferQueue::DestoryResource(void* resource) - return MOS_STATUS_SUCCESS; - } - -+void BufferQueue::SetResourceType(ResourceType resType) -+{ -+ m_resourceType = resType; -+} -+ - } -\ No newline at end of file -diff --git a/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.h b/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.h -index 6ef9424e8c..4aa0898c4d 100644 ---- a/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.h -+++ b/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.h -@@ -87,7 +87,7 @@ class BufferQueue - //! - bool SafeToDestory(); - -- void SetResourceType(ResourceType resType) { m_resourceType = resType; } -+ void SetResourceType(ResourceType resType); - - protected: - //! -diff --git a/media_softlet/agnostic/common/shared/media_debug_serializer.h b/media_softlet/agnostic/common/shared/media_debug_serializer.h -index 77e5fced2d..90d64ad24f 100644 ---- a/media_softlet/agnostic/common/shared/media_debug_serializer.h -+++ b/media_softlet/agnostic/common/shared/media_debug_serializer.h -@@ -34,6 +34,7 @@ - #include <string> - #include <typeinfo> - #include <type_traits> -+#include <stdint.h> - #include "media_class_trace.h" - - template <typename T, typename = void> -diff --git a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp -index 06b107b6bb..fe08b67aeb 100644 ---- a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp -+++ b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp -@@ -29,7 +29,7 @@ - - #include "media_scalability_multipipe.h" - --MOS_STATUS MediaScalabilityMultiPipe::UpdateState() -+MOS_STATUS MediaScalabilityMultiPipe::UpdateState(void *statePars) - { - return MOS_STATUS_SUCCESS; - } -diff --git a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h -index 9f848dcde5..81d3f334b3 100644 ---- a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h -+++ b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h -@@ -50,7 +50,7 @@ class MediaScalabilityMultiPipe: public MediaScalability - //! \return MOS_STATUS - //! MOS_STATUS_SUCCESS if success, else fail reason - //! -- virtual MOS_STATUS UpdateState(); -+ virtual MOS_STATUS UpdateState(void *statePars); - - protected: - inline bool IsFirstPipe() { return (m_currentPipe == 0) ? true : false; } diff --git a/recipes-multimedia/libva/intel-media-driver_23.1.6.bb b/recipes-multimedia/libva/intel-media-driver_23.2.4.bb similarity index 85% rename from recipes-multimedia/libva/intel-media-driver_23.1.6.bb rename to recipes-multimedia/libva/intel-media-driver_23.2.4.bb index 1946fb1f..ccc59f27 100644 --- a/recipes-multimedia/libva/intel-media-driver_23.1.6.bb +++ b/recipes-multimedia/libva/intel-media-driver_23.2.4.bb @@ -19,11 +19,13 @@ REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS += "libva gmmlib" SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ - file://fd67cc3fbd3a362297afc7cc8d75560df62708de.patch \ - file://0001-Encode-fix-fwdRefs-array-out-of-bound-issue.patch \ + file://0001-ARGB-force-to-tile4.patch \ + file://0002-Add-mocs-index-in-patch-list.patch \ + file://0003-fix-vdsfc-csc-issue.patch \ + file://0004-XRGB-force-to-tile4.patch \ " -SRCREV = "8589406d4e7f97c6de55862af775d67d5dd7cd28" +SRCREV = "cf942344b9e439d19873f1d47c0c890d7c63b6ad" S = "${WORKDIR}/git" COMPATIBLE_HOST:x86-x32 = "null" -- 2.40.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8068): https://lists.yoctoproject.org/g/meta-intel/message/8068 Mute This Topic: https://lists.yoctoproject.org/mt/100639403/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
