[Media Common] [VP] Fix gcc-10-mtl-off build error

Fix gcc-10-mtl-off build error
intel · Jul 30, 2024 · 8b90baf · 8b90baf
1 parent ec37ce0
commit 8b90baf
Show file tree

Hide file tree

Showing 20 changed files with 70 additions and 30 deletions.
diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_lpm.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_lpm.h
@@ -1025,4 +1025,4 @@ MEDIA_CLASS_DEFINE_END(mhw__vdbox__huc__xe2_lpm_base__xe2_lpm__Cmd)
 
 #pragma pack()
 
-#endif  // __MHW_VDBOX_HUC_HWCMD_XE_LPM_PLUS_H__
+#endif  // __MHW_VDBOX_HUC_HWCMD_XE2_LPM_H__
diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_huc_impl_xe2_lpm.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_huc_impl_xe2_lpm.h
@@ -21,7 +21,7 @@
 */
 //!
 //! \file     mhw_vdbox_huc_impl_xe2_lpm.h
-//! \brief    MHW VDBOX HUC interface common base for Xe_LPM_plus
+//! \brief    MHW VDBOX HUC interface common base for Xe2_LPM
 //! \details
 //!
 

diff --git a/...gnostic/Xe2_M_plus/Xe2_LPM_base/codec/hal/dec/avc/packet/decode_avc_packet_xe2_lpm_base.h b/...gnostic/Xe2_M_plus/Xe2_LPM_base/codec/hal/dec/avc/packet/decode_avc_packet_xe2_lpm_base.h
@@ -27,7 +27,7 @@
 #ifndef __DECODE_AVC_PACKET_XE2_LPM_BASE_H__
 #define __DECODE_AVC_PACKET_XE2_LPM_BASE_H__
 
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 #include "codec_hw_xe2_lpm_base.h"
 #include "decode_avc_packet.h"
 

diff --git a/...2_M_plus/Xe2_LPM_base/codec/hal/dec/avc/packet/decode_avc_picture_packet_xe2_lpm_base.cpp b/...2_M_plus/Xe2_LPM_base/codec/hal/dec/avc/packet/decode_avc_picture_packet_xe2_lpm_base.cpp
@@ -25,7 +25,7 @@
 //!
 #include "decode_avc_picture_packet_xe2_lpm_base.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode
 {

diff --git a/...Xe2_M_plus/Xe2_LPM_base/codec/hal/dec/avc/packet/decode_avc_picture_packet_xe2_lpm_base.h b/...Xe2_M_plus/Xe2_LPM_base/codec/hal/dec/avc/packet/decode_avc_picture_packet_xe2_lpm_base.h
@@ -29,10 +29,10 @@
 
 #include "decode_avc_picture_packet.h"
 #include "codec_hw_xe2_lpm_base.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 #include "decode_downsampling_packet.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode
 {

diff --git a/..._plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_hevc_packet_back_end_xe2_lpm_base.cpp b/..._plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_hevc_packet_back_end_xe2_lpm_base.cpp
@@ -32,12 +32,11 @@
 #include "decode_status_report_defs.h"
 #include "decode_resource_auto_lock.h"
 #include "hal_oca_interface_next.h"
-#include "mhw_vdbox_vdenc_hwcmd_xe_lpm_plus.h"
 #include "decode_hevc_picture_packet_xe2_lpm_base.h"
 #include "mhw_mi_hwcmd_xe2_lpm_base_next.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode
 {

diff --git a/...plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_hevc_packet_front_end_xe2_lpm_base.cpp b/...plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_hevc_packet_front_end_xe2_lpm_base.cpp
@@ -32,10 +32,10 @@
 #include "decode_status_report_defs.h"
 #include "decode_resource_auto_lock.h"
 #include "hal_oca_interface_next.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 #include "mhw_mi_hwcmd_xe2_lpm_base_next.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode
 {

diff --git a/...e2_M_plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_hevc_packet_long_xe2_lpm_base.cpp b/...e2_M_plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_hevc_packet_long_xe2_lpm_base.cpp
@@ -32,10 +32,10 @@
 #include "decode_status_report_defs.h"
 #include "decode_resource_auto_lock.h"
 #include "hal_oca_interface_next.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 #include "mhw_mi_hwcmd_xe2_lpm_base_next.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode
 {

diff --git a/...plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_hevc_packet_real_tile_xe2_lpm_base.cpp b/...plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_hevc_packet_real_tile_xe2_lpm_base.cpp
@@ -32,10 +32,10 @@
 #include "decode_status_report_defs.h"
 #include "decode_resource_auto_lock.h"
 #include "hal_oca_interface_next.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 #include "mhw_mi_hwcmd_xe2_lpm_base_next.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode
 {

diff --git a/.../Xe2_M_plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_xe2_lpm_base.cpp b/.../Xe2_M_plus/Xe2_LPM_base/codec/hal/dec/hevc/packet/decode_huc_s2l_packet_xe2_lpm_base.cpp
@@ -26,10 +26,10 @@
 #include "decode_huc_s2l_packet_xe2_lpm_base.h"
 #include "mhw_vdbox.h"
 #include "decode_resource_auto_lock.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 #include "mhw_mi_hwcmd_xe2_lpm_base_next.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode {
 

diff --git a/...ostic/Xe2_M_plus/Xe2_LPM_base/codec/hal/dec/jpeg/packet/decode_jpeg_packet_xe2_lpm_base.h b/...ostic/Xe2_M_plus/Xe2_LPM_base/codec/hal/dec/jpeg/packet/decode_jpeg_packet_xe2_lpm_base.h
@@ -65,4 +65,4 @@ MEDIA_CLASS_DEFINE_END(decode__JpegDecodePktXe2_Lpm_Base)
 
 }
 
-#endif //__DECODE_JPEG_PACKET_XE_LPM_PLUS_H__
+#endif //__DECODE_JPEG_PACKET_XE2_LPM_H__
diff --git a/..._M_plus/Xe2_LPM_base/codec/hal/dec/vp9/packet/decode_vp9_packet_back_end_xe2_lpm_base.cpp b/..._M_plus/Xe2_LPM_base/codec/hal/dec/vp9/packet/decode_vp9_packet_back_end_xe2_lpm_base.cpp
@@ -33,9 +33,9 @@
 #include "decode_resource_auto_lock.h"
 #include "hal_oca_interface_next.h"
 #include "decode_vp9_picture_packet_xe2_lpm_base.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode
 {

diff --git a/...M_plus/Xe2_LPM_base/codec/hal/dec/vp9/packet/decode_vp9_packet_front_end_xe2_lpm_base.cpp b/...M_plus/Xe2_LPM_base/codec/hal/dec/vp9/packet/decode_vp9_packet_front_end_xe2_lpm_base.cpp
@@ -32,9 +32,9 @@
 #include "decode_status_report_defs.h"
 #include "decode_resource_auto_lock.h"
 #include "hal_oca_interface_next.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 namespace decode
 {
 

diff --git a/...e2_M_plus/Xe2_LPM_base/codec/hal/dec/vp9/packet/decode_vp9_packet_single_xe2_lpm_base.cpp b/...e2_M_plus/Xe2_LPM_base/codec/hal/dec/vp9/packet/decode_vp9_packet_single_xe2_lpm_base.cpp
@@ -32,9 +32,9 @@
 #include "decode_status_report_defs.h"
 #include "decode_resource_auto_lock.h"
 #include "hal_oca_interface_next.h"
-#include "mhw_vdbox_xe_lpm_plus_base.h"
+#include "mhw_vdbox_xe2_lpm_base.h"
 
-using namespace mhw::vdbox::xe_lpm_plus_base;
+using namespace mhw::vdbox::xe2_lpm_base;
 
 namespace decode
 {

diff --git a/...M_plus/Xe2_LPM_base/codec/hal/dec/vp9/pipeline/decode_vp9_pipeline_adapter_xe2_lpm_base.h b/...M_plus/Xe2_LPM_base/codec/hal/dec/vp9/pipeline/decode_vp9_pipeline_adapter_xe2_lpm_base.h
@@ -80,4 +80,4 @@ class DecodeVp9PipelineAdapterXe2_Lpm_Base : public DecodePipelineAdapter
 MEDIA_CLASS_DEFINE_END(DecodeVp9PipelineAdapterXe2_Lpm_Base)
 };
 
-#endif // !__DECODE_VP9_PIPELINE_ADAPTER_XE_LPM_PLUS_BASE_H__
+#endif // !__DECODE_VP9_PIPELINE_ADAPTER_XE2_LPM_BASE_H__
diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_mi_xe2_lpm_base_next_impl.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_mi_xe2_lpm_base_next_impl.h
@@ -32,7 +32,7 @@
 #include "mhw_mi_hwcmd_xe2_lpm_base_next.h"
 #include "mhw_mi_itf.h"
 #include "mhw_impl.h"
-#include "mhw_mmio_xe_lpm_plus.h"
+#include "mhw_mmio_xe2_lpm_base.h"
 
 #define MHW_MI_TEE_DEFAULT_WATCHDOG_THRESHOLD_IN_MS 200
 
@@ -317,8 +317,8 @@ class Impl : public mi::Impl<Cmd>
             break;
             // TEE
         case MOS_GPU_CONTEXT_TEE:
-            MediaResetParam.watchdogCountCtrlOffset      = WATCHDOG_COUNT_CTRL_OFFSET_TEECS_XE_LPM_PLUS;
-            MediaResetParam.watchdogCountThresholdOffset = WATCHDOG_COUNT_THRESTHOLD_OFFSET_TEECS_XE_LPM_PLUS;
+            MediaResetParam.watchdogCountCtrlOffset      = WATCHDOG_COUNT_CTRL_OFFSET_TEECS_XE2_LPM_BASE ;
+            MediaResetParam.watchdogCountThresholdOffset = WATCHDOG_COUNT_THRESTHOLD_OFFSET_TEECS_XE2_LPM_BASE ;
             break;
             // Default
         default:

diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_mmio_xe2_lpm_base.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_mmio_xe2_lpm_base.h
@@ -62,6 +62,9 @@
 #define WATCHDOG_COUNT_CTRL_OFFSET_VECS_XE2_LPM_BASE                                              0x1C8178
 #define WATCHDOG_COUNT_THRESTHOLD_OFFSET_VECS_XE2_LPM_BASE                                        0x1C817C
 
+#define WATCHDOG_COUNT_CTRL_OFFSET_TEECS_XE2_LPM_BASE                                              0x11A178
+#define WATCHDOG_COUNT_THRESTHOLD_OFFSET_TEECS_XE2_LPM_BASE                                        0x11A17C
+
 //VDBOX HCP
 #define WATCHDOG_COUNT_CTRL_OFFSET_INIT_XE2_LPM_BASE                                              0x1C0178
 #define WATCHDOG_COUNT_THRESTHOLD_OFFSET_INIT_XE2_LPM_BASE                                        0x1C017C
@@ -146,12 +149,44 @@
 #define M_MMIO_MEDIA_HIGH_OFFSET                                                         0x200000 //!< High bound of VDBox and VEBox MMIO offset
 
 //Render
+#define M_MMIO_RCS_AUX_TABLE_BASE_LOW                                                    0x4200
+#define M_MMIO_RCS_AUX_TABLE_BASE_HIGH                                                   0x4204
+#define M_MMIO_RCS_AUX_TABLE_INVALIDATE                                                  0x4208
 #define M_MMIO_RCS_HW_FE_REMAP_RANGE_BEGIN                                               0x2000
 #define M_MMIO_RCS_HW_FE_REMAP_RANGE_END                                                 0x27FF
+#define M_MMIO_RCS_AUX_TBL_REMAP_RANGE_BEGIN                                             0x4200
+#define M_MMIO_RCS_AUX_TBL_REMAP_RANGE_END                                               0x420F
 #define M_MMIO_RCS_TRTT_REMAP_RANGE_BEGIN                                                0x4400
 #define M_MMIO_RCS_TRTT_REMAP_RANGE_END                                                  0x441F
 
+#define M_MMIO_MEDIA_REG_BASE                                                            0X380000//!<Media Engine Base
+
+//VD
+#define M_MMIO_VD0_AUX_TABLE_BASE_LOW                                                    0x4210
+#define M_MMIO_VD0_AUX_TABLE_BASE_HIGH                                                   0x4214
+#define M_MMIO_VD0_AUX_TABLE_INVALIDATE                                                  0x4218
+#define M_MMIO_VD1_AUX_TABLE_BASE_LOW                                                    0x4220
+#define M_MMIO_VD1_AUX_TABLE_BASE_HIGH                                                   0x4224
+#define M_MMIO_VD1_AUX_TABLE_INVALIDATE                                                  0x4228
+#define M_MMIO_VD2_AUX_TABLE_BASE_LOW                                                    0x4290
+#define M_MMIO_VD2_AUX_TABLE_BASE_HIGH                                                   0x4294
+#define M_MMIO_VD2_AUX_TABLE_INVALIDATE                                                  0x4298
+#define M_MMIO_VD3_AUX_TABLE_BASE_LOW                                                    0x42A0
+#define M_MMIO_VD3_AUX_TABLE_BASE_HIGH                                                   0x42A4
+#define M_MMIO_VD3_AUX_TABLE_INVALIDATE                                                  0x42A8
+
+//VE
+#define M_MMIO_VE0_AUX_TABLE_BASE_LOW                                                    0x4230
+#define M_MMIO_VE0_AUX_TABLE_BASE_HIGH                                                   0x4234
+#define M_MMIO_VE0_AUX_TABLE_INVALIDATE                                                  0x4238
+#define M_MMIO_VE1_AUX_TABLE_BASE_LOW                                                    0x42B0
+#define M_MMIO_VE1_AUX_TABLE_BASE_HIGH                                                   0x42B4
+#define M_MMIO_VE1_AUX_TABLE_INVALIDATE                                                  0x42B8
+
 //Compute
+#define M_MMIO_CCS0_AUX_TABLE_BASE_LOW                                                   0x42C0
+#define M_MMIO_CCS0_AUX_TABLE_BASE_HIGH                                                  0x42C4
+#define M_MMIO_CCS0_AUX_TABLE_INVALIDATE                                                 0x42C8
 #define M_MMIO_CCS0_HW_FRONT_END_BASE_BEGIN                                              0x1A000
 #define M_MMIO_CCS0_HW_FRONT_END_BASE_END                                                0x1A7FF
 #define M_MMIO_CCS1_HW_FRONT_END_BASE_BEGIN                                              0x1C000
@@ -173,4 +208,8 @@
 
 #define M_CCS_HW_FRONT_END_MMIO_MASK                                                     0x7FF
 
+//Bilitter engine
+#define M_MMIO_BLT_AUX_TABLE_BASE_LOW 0x4240
+#define M_MMIO_BLT_AUX_TABLE_BASE_HIGH 0x4244
+
 #endif   //__MHW_MMIO_XE2_LPM_BASE_H__
diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/vdbox/mhw_vdbox_hcp_impl_xe2_lpm_base.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/vdbox/mhw_vdbox_hcp_impl_xe2_lpm_base.h
@@ -451,7 +451,7 @@ class BaseImpl : public hcp::Impl<cmd_t>
     }
 MEDIA_CLASS_DEFINE_END(mhw__vdbox__hcp__xe2_lpm_base__BaseImpl)
 };
-}  // namespace xe_lpm_plus_base
+}  // namespace xe2_lpm_base
 }  // namespace hcp
 }  // namespace vdbox
 }  // namespace mhw

diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/shared/mediacopy/media_srcs.cmake b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/shared/mediacopy/media_srcs.cmake
@@ -43,7 +43,7 @@ set(SOFTLET_COMMON_HEADERS_
     ${TMP_HEADERS_}
 )
 
-source_group( "SharedNext\\Xe_LPM_plus_base\\shared\\MediaCopy" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
+source_group( "SharedNext\\Xe2_LPM_base\\shared\\MediaCopy" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 
 set(SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_}

diff --git a/media_softlet/media_interface/media_interfaces_lnl/media_interfaces_lnl.cpp b/media_softlet/media_interface/media_interfaces_lnl/media_interfaces_lnl.cpp
@@ -43,7 +43,9 @@
 #include "media_interfaces_mcpy_next.h"
 
 // use vdenc from Xe_LPM_plus instead of Xe2_LPM
+#ifdef _MEDIA_RESERVED
 #include "mhw_vdbox_vdenc_impl_xe_lpm_plus.h"
+#endif
 
 #ifndef _FULL_OPEN_SOURCE
 #include "igvpkrn_xe2_hpg.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1025,4 +1025,4 @@ MEDIA_CLASS_DEFINE_END(mhw__vdbox__huc__xe2_lpm_base__xe2_lpm__Cmd)

		#pragma pack()

		#endif // __MHW_VDBOX_HUC_HWCMD_XE_LPM_PLUS_H__
		#endif // __MHW_VDBOX_HUC_HWCMD_XE2_LPM_H__
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,4 +65,4 @@ MEDIA_CLASS_DEFINE_END(decode__JpegDecodePktXe2_Lpm_Base)

		}

		#endif //__DECODE_JPEG_PACKET_XE_LPM_PLUS_H__
		#endif //__DECODE_JPEG_PACKET_XE2_LPM_H__