summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/libva
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2023-05-29 10:28:38 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2023-05-29 15:20:35 +0800
commit277f7f7860546fec0b0941aa80ff6521f62f50e5 (patch)
tree9b9b342ce40e4cca0c8328dfbdea52c9034026d2 /recipes-multimedia/libva
parent068182dbcf748cf6fc88bd89eafb1167aeb9fb8c (diff)
downloadmeta-intel-277f7f7860546fec0b0941aa80ff6521f62f50e5.tar.gz
intel-media-driver: fix build with gcc13
Fixes issues [1][2][3] when building with gcc13. [1] https://github.com/intel/media-driver/issues/1639 [2] https://github.com/intel/media-driver/issues/1640 [3] https://github.com/intel/media-driver/issues/1641 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia/libva')
-rw-r--r--recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch291
-rw-r--r--recipes-multimedia/libva/intel-media-driver_23.1.6.bb1
2 files changed, 292 insertions, 0 deletions
diff --git a/recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch b/recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch
new file mode 100644
index 00000000..94b15c69
--- /dev/null
+++ b/recipes-multimedia/libva/files/fd67cc3fbd3a362297afc7cc8d75560df62708de.patch
@@ -0,0 +1,291 @@
1From fd67cc3fbd3a362297afc7cc8d75560df62708de Mon Sep 17 00:00:00 2001
2From: Jay Yang <jay.yang@intel.com>
3Date: Fri, 21 Apr 2023 13:10:52 +0800
4Subject: [PATCH] Fix GCC13 build errors
5
6Fix #1639
7Fix #1640
8Fix #1641
9Signed-off-by: Jay Yang <jay.yang@intel.com>
10
11Upstream-Status: Submitted
12Signed-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
33diff --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
34index 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__
72diff --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
73index 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);
84diff --git a/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h b/media_driver/agnostic/gen12/hw/mhw_vebox_g12_X.h
85index 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,
96diff --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
97index 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
125diff --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
126index 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:
137diff --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
138index 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;
151diff --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
152index 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.
163diff --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
164index 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.
175diff --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
176index 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.
187diff --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
188index 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
202diff --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
203index 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.
214diff --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
215index 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.
226diff --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
227index 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
241diff --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
242index 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 //!
254diff --git a/media_softlet/agnostic/common/shared/media_debug_serializer.h b/media_softlet/agnostic/common/shared/media_debug_serializer.h
255index 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>
266diff --git a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.cpp
267index 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 }
279diff --git a/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h b/media_softlet/agnostic/common/shared/scalability/media_scalability_multipipe.h
280index 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.1.6.bb
index f81611a8..88b06e77 100644
--- a/recipes-multimedia/libva/intel-media-driver_23.1.6.bb
+++ b/recipes-multimedia/libva/intel-media-driver_23.1.6.bb
@@ -19,6 +19,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
19DEPENDS += "libva gmmlib" 19DEPENDS += "libva gmmlib"
20 20
21SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ 21SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
22 file://fd67cc3fbd3a362297afc7cc8d75560df62708de.patch \
22 " 23 "
23 24
24SRCREV = "8589406d4e7f97c6de55862af775d67d5dd7cd28" 25SRCREV = "8589406d4e7f97c6de55862af775d67d5dd7cd28"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 21:28:43 +0000