diff options
-rw-r--r-- | recipes-multimedia/libva/files/0001-ARGB-force-to-tile4.patch | 35 | ||||
-rw-r--r-- | recipes-multimedia/libva/files/0001-Encode-fix-fwdRefs-array-out-of-bound-issue.patch | 35 | ||||
-rw-r--r-- | recipes-multimedia/libva/files/0002-Add-mocs-index-in-patch-list.patch | 31 | ||||
-rw-r--r-- | recipes-multimedia/libva/files/0003-fix-vdsfc-csc-issue.patch | 88 | ||||
-rw-r--r-- | recipes-multimedia/libva/files/0004-XRGB-force-to-tile4.patch | 35 | ||||
-rw-r--r-- | recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch | 291 | ||||
-rw-r--r-- | recipes-multimedia/libva/intel-media-driver_23.2.4.bb (renamed from recipes-multimedia/libva/intel-media-driver_23.1.6.bb) | 8 |
7 files changed, 194 insertions, 329 deletions
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 @@ | |||
1 | From f172dc91c054bb6377b733db12d9210e5f73e7b2 Mon Sep 17 00:00:00 2001 | ||
2 | From: JayYang <jay.yang@intel.com> | ||
3 | Date: Fri, 7 Jul 2023 13:40:14 +0800 | ||
4 | Subject: [PATCH 1/5] ARGB force to tile4 | ||
5 | |||
6 | Gmm may create tile64 ARGB surfaces, whereas no tile64 modifier is defined to export such surfaces. | ||
7 | Force ARGB, ABGR, A2RGB10 surfaces to tile4 as WA. | ||
8 | |||
9 | upstream-status: backport | ||
10 | Backport from upstream intel-media-driver: | ||
11 | https://github.com/intel/media-driver/commit/bd5bde0d8a0c0a6672c3586ee6727eff3ca9bc21 | ||
12 | --- | ||
13 | media_softlet/linux/common/ddi/media_libva_util_next.cpp | 6 ++++++ | ||
14 | 1 file changed, 6 insertions(+) | ||
15 | |||
16 | diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp | ||
17 | index e3c49eef8..1852e59d2 100644 | ||
18 | --- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp | ||
19 | +++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp | ||
20 | @@ -647,6 +647,12 @@ VAStatus MediaLibvaUtilNext::GenerateGmmParamsForInternalSurface( | ||
21 | } | ||
22 | } | ||
23 | } | ||
24 | + // For ARGB surface, always allocate it as tile4. | ||
25 | + // This is a WA for ExportSurfaceHandle because modifer for tile64 isn't defined. | ||
26 | + if ((params.format == Media_Format_A8R8G8B8 || params.format == Media_Format_B10G10R10A2 || params.format == Media_Format_A8B8G8R8) && !MEDIA_IS_SKU(&mediaDrvCtx->SkuTable, FtrTileY)) | ||
27 | + { | ||
28 | + gmmParams.Flags.Info.Tile4 = true; | ||
29 | + } | ||
30 | break; | ||
31 | case I915_TILING_X: | ||
32 | gmmParams.Flags.Info.TiledX = true; | ||
33 | -- | ||
34 | 2.40.1 | ||
35 | |||
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 @@ | |||
1 | From e8bb025cd56c269adf3ffdc3dda404505974f676 Mon Sep 17 00:00:00 2001 | ||
2 | From: bai-isaac <isaac.bai@intel.com> | ||
3 | Date: Mon, 12 Jun 2023 12:44:29 +0800 | ||
4 | Subject: [PATCH] [Encode] fix fwdRefs array out of bound issue | ||
5 | |||
6 | fix fwdRefs array out of bound issue. | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/d795297127488b328f1cc260cf5da66debf95b99] | ||
9 | Expect it to be removed once move to intel-media-23.2.4 or above | ||
10 | |||
11 | Signed-off-by: Ch'ng, Seng Guan <seng.guan.chng@intel.com> | ||
12 | --- | ||
13 | media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_impl.h | 3 ++- | ||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | 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 | ||
17 | index 3b79f4886..85a5a4127 100644 | ||
18 | --- a/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_impl.h | ||
19 | +++ b/media_softlet/agnostic/common/hw/vdbox/mhw_vdbox_vdenc_impl.h | ||
20 | @@ -649,10 +649,11 @@ protected: | ||
21 | &resourceParams)); | ||
22 | } | ||
23 | |||
24 | + // SCC will use BwdRef0 as extra slot to store IBC if max fwd ref num is 3. | ||
25 | typename cmd_t::VDENC_Reference_Picture_CMD *fwdRefs[] = | ||
26 | {&cmd.FwdRef0, &cmd.FwdRef1, &cmd.FwdRef2, &cmd.BwdRef0}; | ||
27 | uint32_t fwdRefsDwLoaction[] = | ||
28 | - {_MHW_CMD_DW_LOCATION(FwdRef0), _MHW_CMD_DW_LOCATION(FwdRef1), _MHW_CMD_DW_LOCATION(FwdRef2)}; | ||
29 | + {_MHW_CMD_DW_LOCATION(FwdRef0), _MHW_CMD_DW_LOCATION(FwdRef1), _MHW_CMD_DW_LOCATION(FwdRef2), _MHW_CMD_DW_LOCATION(BwdRef0)}; | ||
30 | |||
31 | typename cmd_t::VDENC_Down_Scaled_Reference_Picture_CMD *fwdRefsDsStage1[] = | ||
32 | {&cmd.DsFwdRef0, &cmd.DsFwdRef1}; | ||
33 | -- | ||
34 | 2.40.1 | ||
35 | |||
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 @@ | |||
1 | From 80c5c6e6e671d61eae16a53fd36442993813609f Mon Sep 17 00:00:00 2001 | ||
2 | From: LeyuYao <leyu.yao@intel.com> | ||
3 | Date: Mon, 3 Jul 2023 00:58:09 +0800 | ||
4 | Subject: [PATCH 2/5] Add mocs index in patch list | ||
5 | |||
6 | For linux usage | ||
7 | |||
8 | upstream-status: backport | ||
9 | |||
10 | Backport from upstream media-driver: | ||
11 | https://github.com/intel/media-driver/commit/26d5f57cad88df823164944ad496507d22a50fb1 | ||
12 | --- | ||
13 | media_softlet/agnostic/common/hw/mhw_utilities_next.cpp | 2 ++ | ||
14 | 1 file changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/media_softlet/agnostic/common/hw/mhw_utilities_next.cpp b/media_softlet/agnostic/common/hw/mhw_utilities_next.cpp | ||
17 | index a9db7bf95..4db4e1f66 100644 | ||
18 | --- a/media_softlet/agnostic/common/hw/mhw_utilities_next.cpp | ||
19 | +++ b/media_softlet/agnostic/common/hw/mhw_utilities_next.cpp | ||
20 | @@ -290,6 +290,8 @@ MOS_STATUS Mhw_AddResourceToCmd_PatchList( | ||
21 | // Offset and command LSB parameters | ||
22 | dwOffset = pParams->dwOffset | ((*pParams->pdwCmd) & ((1 << dwLsbNum) - 1)); | ||
23 | |||
24 | + Mhw_SetMocsTableIndex(pOsInterface, pParams->presResource, pParams->mocsParams); | ||
25 | + | ||
26 | if (pParams->dwOffsetInSSH > 0) | ||
27 | { | ||
28 | // Calculate the patch offset to command buffer | ||
29 | -- | ||
30 | 2.40.1 | ||
31 | |||
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 @@ | |||
1 | From e4f88d8a7fbde1df022a648e2cd06c1b8abbd4e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: shawnli2 <shawn.li@intel.com> | ||
3 | Date: Sun, 25 Jun 2023 15:25:11 +0800 | ||
4 | Subject: [PATCH 3/5] fix vdsfc csc issue | ||
5 | |||
6 | to support ARGB8 output, need to enable csc from YUV to RGB | ||
7 | |||
8 | upstream-status: backport | ||
9 | Backport from upstream media-driver: | ||
10 | https://github.com/intel/media-driver/commit/9806aede1724d5eea3a8ddb262d1f2cbcca63456 | ||
11 | --- | ||
12 | .../Xe_XPM_base/vp/hal/packet/vp_render_sfc_xe_xpm_base.cpp | 5 +++-- | ||
13 | .../common/vp/hal/packet/vp_render_sfc_base_legacy.cpp | 4 ++-- | ||
14 | .../vp/hal/packet/vp_render_sfc_xe_lpm_plus_base.cpp | 5 +++-- | ||
15 | .../agnostic/common/vp/hal/packet/vp_render_sfc_base.cpp | 4 ++-- | ||
16 | 4 files changed, 10 insertions(+), 8 deletions(-) | ||
17 | |||
18 | 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 | ||
19 | index 24bade3fd..daccd21f0 100644 | ||
20 | --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/vp/hal/packet/vp_render_sfc_xe_xpm_base.cpp | ||
21 | +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/vp/hal/packet/vp_render_sfc_xe_xpm_base.cpp | ||
22 | @@ -298,9 +298,10 @@ bool SfcRenderXe_Xpm_Base::IsOutputChannelSwapNeeded(MOS_FORMAT outputFormat) | ||
23 | bool SfcRenderXe_Xpm_Base::IsCscNeeded(SFC_CSC_PARAMS &cscParams) | ||
24 | { | ||
25 | VP_FUNC_CALL(); | ||
26 | - if (m_bVdboxToSfc && m_videoConfig.codecStandard == CODECHAL_JPEG) | ||
27 | + | ||
28 | + if (m_bVdboxToSfc && cscParams.inputFormat != cscParams.outputFormat) | ||
29 | { | ||
30 | - if (cscParams.inputFormat != cscParams.outputFormat) | ||
31 | + if (m_videoConfig.codecStandard == CODECHAL_JPEG || cscParams.outputFormat == Format_A8R8G8B8) | ||
32 | { | ||
33 | return true; | ||
34 | } | ||
35 | 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 | ||
36 | index 16cef55b3..19c99364b 100644 | ||
37 | --- a/media_driver/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base_legacy.cpp | ||
38 | +++ b/media_driver/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base_legacy.cpp | ||
39 | @@ -197,10 +197,10 @@ MOS_STATUS SfcRenderBaseLegacy::SetIefStateCscParams( | ||
40 | { | ||
41 | psfcStateParams->bCSCEnable = true; | ||
42 | pIEFStateParams->bCSCEnable = true; | ||
43 | - if (m_bVdboxToSfc && m_videoConfig.codecStandard == CODECHAL_JPEG) | ||
44 | + if (m_bVdboxToSfc) | ||
45 | { | ||
46 | m_cscInputSwapNeeded = false; | ||
47 | - if (m_videoConfig.jpeg.jpegChromaType == jpegRGB) | ||
48 | + if (m_videoConfig.jpeg.jpegChromaType == jpegRGB && m_videoConfig.codecStandard == CODECHAL_JPEG) | ||
49 | { | ||
50 | m_cscCoeff[0] = 1.000000000f; | ||
51 | m_cscCoeff[1] = 0.000000000f; | ||
52 | 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 | ||
53 | index 304fd2ffc..e9737c3c5 100644 | ||
54 | --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/vp/hal/packet/vp_render_sfc_xe_lpm_plus_base.cpp | ||
55 | +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/vp/hal/packet/vp_render_sfc_xe_lpm_plus_base.cpp | ||
56 | @@ -636,9 +636,10 @@ bool SfcRenderXe_Lpm_Plus_Base::IsOutputChannelSwapNeeded(MOS_FORMAT outputForma | ||
57 | bool SfcRenderXe_Lpm_Plus_Base::IsCscNeeded(SFC_CSC_PARAMS &cscParams) | ||
58 | { | ||
59 | VP_FUNC_CALL(); | ||
60 | - if (m_bVdboxToSfc && m_videoConfig.codecStandard == CODECHAL_JPEG) | ||
61 | + | ||
62 | + if (m_bVdboxToSfc && cscParams.inputFormat != cscParams.outputFormat) | ||
63 | { | ||
64 | - if (cscParams.inputFormat != cscParams.outputFormat) | ||
65 | + if (m_videoConfig.codecStandard == CODECHAL_JPEG || cscParams.outputFormat == Format_A8R8G8B8) | ||
66 | { | ||
67 | return true; | ||
68 | } | ||
69 | 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 | ||
70 | index 573a0a12d..2b7c5231a 100644 | ||
71 | --- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base.cpp | ||
72 | +++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_sfc_base.cpp | ||
73 | @@ -238,10 +238,10 @@ MOS_STATUS SfcRenderBase::SetIefStateCscParams( | ||
74 | { | ||
75 | psfcStateParams->bCSCEnable = true; | ||
76 | pIEFStateParams->bCSCEnable = true; | ||
77 | - if (m_bVdboxToSfc && m_videoConfig.codecStandard == CODECHAL_JPEG) | ||
78 | + if (m_bVdboxToSfc) | ||
79 | { | ||
80 | m_cscInputSwapNeeded = false; | ||
81 | - if (m_videoConfig.jpeg.jpegChromaType == jpegRGB) | ||
82 | + if (m_videoConfig.jpeg.jpegChromaType == jpegRGB && m_videoConfig.codecStandard == CODECHAL_JPEG) | ||
83 | { | ||
84 | m_cscCoeff[0] = 1.000000000f; | ||
85 | m_cscCoeff[1] = 0.000000000f; | ||
86 | -- | ||
87 | 2.40.1 | ||
88 | |||
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 @@ | |||
1 | From bd96cac9a35a8ca98c7e2b8f622afb75f31ed221 Mon Sep 17 00:00:00 2001 | ||
2 | From: JayYang <jay.yang@intel.com> | ||
3 | Date: Thu, 27 Jul 2023 21:05:50 +0800 | ||
4 | Subject: [PATCH 4/5] XRGB force to tile4 | ||
5 | |||
6 | Force BGRX surfaces to tile4 because glimagesink plugins backend support by 3D mesa | ||
7 | driver is reporting back the XR24 (BGRx) for dmabuf modifier case is 0x0100000000000009 | ||
8 | |||
9 | upstream-status: backport | ||
10 | |||
11 | Backport from upstream media-driver: | ||
12 | https://github.com/intel/media-driver/commit/b6d038491372f39330b33620ed8bdb8255b57a66 | ||
13 | --- | ||
14 | media_softlet/linux/common/ddi/media_libva_util_next.cpp | 5 ++++- | ||
15 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp | ||
18 | index 1852e59d2..b31607945 100644 | ||
19 | --- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp | ||
20 | +++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp | ||
21 | @@ -649,7 +649,10 @@ VAStatus MediaLibvaUtilNext::GenerateGmmParamsForInternalSurface( | ||
22 | } | ||
23 | // For ARGB surface, always allocate it as tile4. | ||
24 | // This is a WA for ExportSurfaceHandle because modifer for tile64 isn't defined. | ||
25 | - if ((params.format == Media_Format_A8R8G8B8 || params.format == Media_Format_B10G10R10A2 || params.format == Media_Format_A8B8G8R8) && !MEDIA_IS_SKU(&mediaDrvCtx->SkuTable, FtrTileY)) | ||
26 | + if ((params.format == Media_Format_A8R8G8B8 || | ||
27 | + params.format == Media_Format_B10G10R10A2 || | ||
28 | + params.format == Media_Format_A8B8G8R8 || | ||
29 | + params.format == Media_Format_X8R8G8B8) && !MEDIA_IS_SKU(&mediaDrvCtx->SkuTable, FtrTileY)) | ||
30 | { | ||
31 | gmmParams.Flags.Info.Tile4 = true; | ||
32 | } | ||
33 | -- | ||
34 | 2.40.1 | ||
35 | |||
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 @@ | |||
1 | From fd67cc3fbd3a362297afc7cc8d75560df62708de Mon Sep 17 00:00:00 2001 | ||
2 | From: Jay Yang <jay.yang@intel.com> | ||
3 | Date: Fri, 21 Apr 2023 13:10:52 +0800 | ||
4 | Subject: [PATCH] Fix GCC13 build errors | ||
5 | |||
6 | Fix #1639 | ||
7 | Fix #1640 | ||
8 | Fix #1641 | ||
9 | Signed-off-by: Jay Yang <jay.yang@intel.com> | ||
10 | |||
11 | Upstream-Status: Submitted | ||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
13 | --- | ||
14 | .../Xe_M/Xe_XPM/hw/mhw_vebox_xe_xpm.h | 21 +++++++++++-------- | ||
15 | .../hal/codechal_encode_csc_ds_mdf_g12.h | 1 + | ||
16 | .../agnostic/gen12/hw/mhw_vebox_g12_X.h | 1 + | ||
17 | .../gen12/hw/vdbox/mhw_vdbox_avp_generic.h | 19 ----------------- | ||
18 | .../gen9/codec/hal/codechal_encode_avc_g9.h | 1 + | ||
19 | .../codec/hal/codechal_fei_hevc_g9_skl.cpp | 3 --- | ||
20 | .../shared/mediacopy/media_copy_xe_hpm.h | 1 + | ||
21 | .../shared/mediacopy/media_copy_xe_xpm_base.h | 1 + | ||
22 | .../shared/mediacopy/media_copy_xe_xpm_plus.h | 1 + | ||
23 | .../hucitf/decode_huc_packet_creator_g12.h | 4 ++++ | ||
24 | .../m12_0/shared/mediacopy/media_copy_m12_0.h | 1 + | ||
25 | .../mediacopy/media_copy_xe_lpm_plus_base.h | 1 + | ||
26 | .../bufferMgr/encode_tracked_buffer_queue.cpp | 5 +++++ | ||
27 | .../bufferMgr/encode_tracked_buffer_queue.h | 2 +- | ||
28 | .../common/shared/media_debug_serializer.h | 1 + | ||
29 | .../media_scalability_multipipe.cpp | 2 +- | ||
30 | .../scalability/media_scalability_multipipe.h | 2 +- | ||
31 | 17 files changed, 33 insertions(+), 34 deletions(-) | ||
32 | |||
33 | 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 | ||
34 | index b6b86a54ed..ae9a4be096 100644 | ||
35 | --- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_xe_xpm.h | ||
36 | +++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_xe_xpm.h | ||
37 | @@ -110,15 +110,6 @@ class MhwVeboxInterfaceXe_Xpm: public MhwVeboxInterfaceG12 | ||
38 | PMOS_COMMAND_BUFFER pCmdBuffer, | ||
39 | PMHW_VEBOX_SURFACE_STATE_CMD_PARAMS pVeboxSurfaceStateCmdParams) override; | ||
40 | |||
41 | - void SetVeboxSurfaces( | ||
42 | - PMHW_VEBOX_SURFACE_PARAMS pSurfaceParam, | ||
43 | - PMHW_VEBOX_SURFACE_PARAMS pDerivedSurfaceParam, | ||
44 | - PMHW_VEBOX_SURFACE_PARAMS pSkinScoreSurfaceParam, | ||
45 | - mhw_vebox_xe_xpm::VEBOX_SURFACE_STATE_CMD *pVeboxSurfaceState, | ||
46 | - bool bIsOutputSurface, | ||
47 | - bool bDIEnable, | ||
48 | - bool b3DlutEnable); | ||
49 | - | ||
50 | MOS_STATUS FindVeboxGpuNodeToUse( | ||
51 | PMHW_VEBOX_GPUNODE_LIMIT pGpuNodeLimit) override; | ||
52 | |||
53 | @@ -144,6 +135,18 @@ class MhwVeboxInterfaceXe_Xpm: public MhwVeboxInterfaceG12 | ||
54 | uint32_t m_indexofVebox = 0; | ||
55 | uint32_t m_numofVebox = 1; | ||
56 | uint32_t m_usingSfc = 0; | ||
57 | + | ||
58 | + using MhwVeboxInterfaceG12::SetVeboxSurfaces; | ||
59 | + | ||
60 | + void SetVeboxSurfaces( | ||
61 | + PMHW_VEBOX_SURFACE_PARAMS pSurfaceParam, | ||
62 | + PMHW_VEBOX_SURFACE_PARAMS pDerivedSurfaceParam, | ||
63 | + PMHW_VEBOX_SURFACE_PARAMS pSkinScoreSurfaceParam, | ||
64 | + mhw_vebox_xe_xpm::VEBOX_SURFACE_STATE_CMD *pVeboxSurfaceState, | ||
65 | + bool bIsOutputSurface, | ||
66 | + bool bDIEnable, | ||
67 | + bool b3DlutEnable); | ||
68 | + | ||
69 | }; | ||
70 | |||
71 | #endif // __MHW_VEBOX_XE_XPM_H__ | ||
72 | 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 | ||
73 | index 3dd276a748..ce21993da7 100644 | ||
74 | --- a/media_driver/agnostic/gen12/codec/hal/codechal_encode_csc_ds_mdf_g12.h | ||
75 | +++ b/media_driver/agnostic/gen12/codec/hal/codechal_encode_csc_ds_mdf_g12.h | ||
76 | @@ -202,6 +202,7 @@ class CodechalEncodeCscDsMdfG12 : public CodechalEncodeCscDsG12 | ||
77 | |||
78 | MOS_STATUS CscKernel( | ||
79 | KernelParams* pParams) override; | ||
80 | + using CodechalEncodeCscDsG12::InitKernelStateCsc; | ||
81 | MOS_STATUS InitKernelStateCsc(KernelParams* pParams); | ||
82 | MOS_STATUS SetupKernelArgsCSC(CmKernel *cmKrnCSCDS, SurfaceParamsCscMdf* surfaceparams); | ||
83 | MOS_STATUS SetCurbeCscforMDF(CMRT_UMD::vector<uint32_t, 10> & curbeData); | ||
84 | diff --git a/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h b/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h | ||
85 | index 64e2ffe462..d0c2d6ca5e 100644 | ||
86 | --- a/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h | ||
87 | +++ b/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h | ||
88 | @@ -336,6 +336,7 @@ class MhwVeboxInterfaceG12 : public MhwVeboxInterfaceGeneric<mhw_vebox_g12_X> | ||
89 | MOS_STATUS ValidateVeboxScalabilityConfig(); | ||
90 | #endif | ||
91 | |||
92 | +protected: | ||
93 | void SetVeboxSurfaces( | ||
94 | PMHW_VEBOX_SURFACE_PARAMS pSurfaceParam, | ||
95 | PMHW_VEBOX_SURFACE_PARAMS pDerivedSurfaceParam, | ||
96 | 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 | ||
97 | index ae1bd88cb2..fb2fc0fe86 100644 | ||
98 | --- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_generic.h | ||
99 | +++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_generic.h | ||
100 | @@ -95,24 +95,5 @@ class MhwVdboxAvpInterfaceGeneric : public MhwVdboxAvpInterface | ||
101 | |||
102 | return eStatus; | ||
103 | } | ||
104 | - | ||
105 | - MOS_STATUS AddAvpBsdObjectCmd( | ||
106 | - PMOS_COMMAND_BUFFER cmdBuffer, | ||
107 | - MhwVdboxAvpBsdParams *params) | ||
108 | - { | ||
109 | - MOS_STATUS eStatus = MOS_STATUS_SUCCESS; | ||
110 | - | ||
111 | - MHW_FUNCTION_ENTER; | ||
112 | - MHW_MI_CHK_NULL(m_osInterface); | ||
113 | - | ||
114 | - typename TAvpCmds::AVP_BSD_OBJECT_CMD cmd; | ||
115 | - | ||
116 | - cmd.DW1.IndirectBsdDataLength = params->m_bsdDataLength; | ||
117 | - cmd.DW2.IndirectDataStartAddress = params->m_bsdDataStartOffset; | ||
118 | - | ||
119 | - MHW_MI_CHK_STATUS(m_osInterface->pfnAddCommand(cmdBuffer, &cmd, sizeof(cmd))); | ||
120 | - | ||
121 | - return eStatus; | ||
122 | - } | ||
123 | }; | ||
124 | #endif | ||
125 | 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 | ||
126 | index f981860946..a735bb46cf 100644 | ||
127 | --- a/media_driver/agnostic/gen9/codec/hal/codechal_encode_avc_g9.h | ||
128 | +++ b/media_driver/agnostic/gen9/codec/hal/codechal_encode_avc_g9.h | ||
129 | @@ -5668,6 +5668,7 @@ class CodechalEncodeAvcEncG9 : public CodechalEncodeAvcEnc | ||
130 | MOS_STATUS GetStatusReport( | ||
131 | void *status, | ||
132 | uint16_t numStatus) override; | ||
133 | + using CodechalEncodeAvcEnc::GetStatusReport; | ||
134 | |||
135 | #if USE_CODECHAL_DEBUG_TOOL | ||
136 | protected: | ||
137 | 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 | ||
138 | index 8da01da3f0..59c0480653 100644 | ||
139 | --- a/media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.cpp | ||
140 | +++ b/media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.cpp | ||
141 | @@ -6410,9 +6410,6 @@ MOS_STATUS CodechalFeiHevcStateG9Skl::FreeEncResources() | ||
142 | |||
143 | m_cmKernelMap.clear(); | ||
144 | |||
145 | - CmKernelMapType deallocator; | ||
146 | - m_cmKernelMap.swap(deallocator); | ||
147 | - | ||
148 | #endif | ||
149 | |||
150 | return eStatus; | ||
151 | 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 | ||
152 | index b43087e93c..23bf56075c 100644 | ||
153 | --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/shared/mediacopy/media_copy_xe_hpm.h | ||
154 | +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/shared/mediacopy/media_copy_xe_hpm.h | ||
155 | @@ -50,6 +50,7 @@ class MediaCopyState_Xe_Hpm: public MediaCopyBaseState | ||
156 | //! | ||
157 | //! \brief init function. | ||
158 | virtual MOS_STATUS Initialize( PMOS_INTERFACE osInterface, MhwInterfaces *mhwInterfaces); | ||
159 | + using MediaCopyBaseState::Initialize; | ||
160 | |||
161 | //! | ||
162 | //! \brief render format support. | ||
163 | 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 | ||
164 | index 8075553c0d..14c291a4a1 100644 | ||
165 | --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/shared/mediacopy/media_copy_xe_xpm_base.h | ||
166 | +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_base/shared/mediacopy/media_copy_xe_xpm_base.h | ||
167 | @@ -49,6 +49,7 @@ class MediaCopyStateXe_Xpm_Base: public MediaCopyBaseState | ||
168 | //! | ||
169 | //! \brief init function. | ||
170 | virtual MOS_STATUS Initialize( PMOS_INTERFACE osInterface, MhwInterfaces *mhwInterfaces); | ||
171 | + using MediaCopyBaseState::Initialize; | ||
172 | |||
173 | //! | ||
174 | //! \brief surface copy pre process. | ||
175 | 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 | ||
176 | index 99f7bfe525..e24f42963f 100644 | ||
177 | --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_plus/shared/mediacopy/media_copy_xe_xpm_plus.h | ||
178 | +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_XPM_plus/shared/mediacopy/media_copy_xe_xpm_plus.h | ||
179 | @@ -50,6 +50,7 @@ class MediaCopyStateXe_Xpm_Plus: public MediaCopyBaseState | ||
180 | //! | ||
181 | //! \brief init function. | ||
182 | virtual MOS_STATUS Initialize(PMOS_INTERFACE osInterface, MhwInterfaces *mhwInterfaces); | ||
183 | + using MediaCopyBaseState::Initialize; | ||
184 | |||
185 | //! | ||
186 | //! \brief render format support. | ||
187 | 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 | ||
188 | index 682c9352bd..1774ff6dcf 100644 | ||
189 | --- a/media_driver/media_softlet/agnostic/gen12_base/codec/hal/dec/shared/hucitf/decode_huc_packet_creator_g12.h | ||
190 | +++ b/media_driver/media_softlet/agnostic/gen12_base/codec/hal/dec/shared/hucitf/decode_huc_packet_creator_g12.h | ||
191 | @@ -48,6 +48,10 @@ class HucPacketCreatorG12 : public HucPacketCreatorBase | ||
192 | MediaPipeline *pipeline, | ||
193 | MediaTask *task, | ||
194 | CodechalHwInterface *hwInterface); | ||
195 | + | ||
196 | + using HucPacketCreatorBase::CreateHucCopyPkt; | ||
197 | + using HucPacketCreatorBase::CreateProbUpdatePkt; | ||
198 | + using HucPacketCreatorBase::CreateStreamOutInterface; | ||
199 | MEDIA_CLASS_DEFINE_END(decode__HucPacketCreatorG12) | ||
200 | }; | ||
201 | |||
202 | 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 | ||
203 | index 25e5972b7d..7e267011ad 100644 | ||
204 | --- a/media_driver/media_softlet/agnostic/m12/m12_0/shared/mediacopy/media_copy_m12_0.h | ||
205 | +++ b/media_driver/media_softlet/agnostic/m12/m12_0/shared/mediacopy/media_copy_m12_0.h | ||
206 | @@ -51,6 +51,7 @@ class MediaCopyStateM12_0: public MediaCopyBaseState | ||
207 | //! | ||
208 | //! \brief init function. | ||
209 | virtual MOS_STATUS Initialize( PMOS_INTERFACE osInterface, MhwInterfaces *mhwInterfaces); | ||
210 | + using MediaCopyBaseState::Initialize; | ||
211 | |||
212 | //! | ||
213 | //! \brief render format support. | ||
214 | 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 | ||
215 | index 1f3c14ff44..5775a81732 100644 | ||
216 | --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/shared/mediacopy/media_copy_xe_lpm_plus_base.h | ||
217 | +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/shared/mediacopy/media_copy_xe_lpm_plus_base.h | ||
218 | @@ -48,6 +48,7 @@ class MediaCopyStateXe_Lpm_Plus_Base: public MediaCopyBaseState | ||
219 | //! | ||
220 | //! \brief init function. | ||
221 | virtual MOS_STATUS Initialize(PMOS_INTERFACE osInterface, MhwInterfacesNext *mhwInterfaces); | ||
222 | + using MediaCopyBaseState::Initialize; | ||
223 | |||
224 | //! | ||
225 | //! \brief render format support. | ||
226 | 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 | ||
227 | index ccd75e3d97..5c53583b02 100644 | ||
228 | --- a/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.cpp | ||
229 | +++ b/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.cpp | ||
230 | @@ -154,4 +154,9 @@ MOS_STATUS BufferQueue::DestoryResource(void* resource) | ||
231 | return MOS_STATUS_SUCCESS; | ||
232 | } | ||
233 | |||
234 | +void BufferQueue::SetResourceType(ResourceType resType) | ||
235 | +{ | ||
236 | + m_resourceType = resType; | ||
237 | +} | ||
238 | + | ||
239 | } | ||
240 | \ No newline at end of file | ||
241 | 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 | ||
242 | index 6ef9424e8c..4aa0898c4d 100644 | ||
243 | --- a/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.h | ||
244 | +++ b/media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer_queue.h | ||
245 | @@ -87,7 +87,7 @@ class BufferQueue | ||
246 | //! | ||
247 | bool SafeToDestory(); | ||
248 | |||
249 | - void SetResourceType(ResourceType resType) { m_resourceType = resType; } | ||
250 | + void SetResourceType(ResourceType resType); | ||
251 | |||
252 | protected: | ||
253 | //! | ||
254 | diff --git a/media_softlet/agnostic/common/shared/media_debug_serializer.h b/media_softlet/agnostic/common/shared/media_debug_serializer.h | ||
255 | index 77e5fced2d..90d64ad24f 100644 | ||
256 | --- a/media_softlet/agnostic/common/shared/media_debug_serializer.h | ||
257 | +++ b/media_softlet/agnostic/common/shared/media_debug_serializer.h | ||
258 | @@ -34,6 +34,7 @@ | ||
259 | #include <string> | ||
260 | #include <typeinfo> | ||
261 | #include <type_traits> | ||
262 | +#include <stdint.h> | ||
263 | #include "media_class_trace.h" | ||
264 | |||
265 | template <typename T, typename = void> | ||
266 | diff --git a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp | ||
267 | index 06b107b6bb..fe08b67aeb 100644 | ||
268 | --- a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp | ||
269 | +++ b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp | ||
270 | @@ -29,7 +29,7 @@ | ||
271 | |||
272 | #include "media_scalability_multipipe.h" | ||
273 | |||
274 | -MOS_STATUS MediaScalabilityMultiPipe::UpdateState() | ||
275 | +MOS_STATUS MediaScalabilityMultiPipe::UpdateState(void *statePars) | ||
276 | { | ||
277 | return MOS_STATUS_SUCCESS; | ||
278 | } | ||
279 | diff --git a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h | ||
280 | index 9f848dcde5..81d3f334b3 100644 | ||
281 | --- a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h | ||
282 | +++ b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h | ||
283 | @@ -50,7 +50,7 @@ class MediaScalabilityMultiPipe: public MediaScalability | ||
284 | //! \return MOS_STATUS | ||
285 | //! MOS_STATUS_SUCCESS if success, else fail reason | ||
286 | //! | ||
287 | - virtual MOS_STATUS UpdateState(); | ||
288 | + virtual MOS_STATUS UpdateState(void *statePars); | ||
289 | |||
290 | protected: | ||
291 | 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 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" | |||
19 | DEPENDS += "libva gmmlib" | 19 | DEPENDS += "libva gmmlib" |
20 | 20 | ||
21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ | 21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ |
22 | file://fd67cc3fbd3a362297afc7cc8d75560df62708de.patch \ | 22 | file://0001-ARGB-force-to-tile4.patch \ |
23 | file://0001-Encode-fix-fwdRefs-array-out-of-bound-issue.patch \ | 23 | file://0002-Add-mocs-index-in-patch-list.patch \ |
24 | file://0003-fix-vdsfc-csc-issue.patch \ | ||
25 | file://0004-XRGB-force-to-tile4.patch \ | ||
24 | " | 26 | " |
25 | 27 | ||
26 | SRCREV = "8589406d4e7f97c6de55862af775d67d5dd7cd28" | 28 | SRCREV = "cf942344b9e439d19873f1d47c0c890d7c63b6ad" |
27 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
28 | 30 | ||
29 | COMPATIBLE_HOST:x86-x32 = "null" | 31 | COMPATIBLE_HOST:x86-x32 = "null" |