Merge branch 'intel:master' into master

GermanAizek · web-flow · commit 89699ede3b6e · 2025-01-19T01:16:11.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 cmake_minimum_required(VERSION 3.5)
 project(IntelMediaDriver)
-set(MEDIA_VERSION "25.1.0${MEDIA_VERSION_EXTRA}" CACHE STRING "" FORCE)
+set(MEDIA_VERSION "25.1.1${MEDIA_VERSION_EXTRA}" CACHE STRING "" FORCE)
 
 
 
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
@@ -311,13 +311,17 @@ bool SfcRenderXe_Xpm_Base::IsCscNeeded(SFC_CSC_PARAMS &cscParams)
 
 MOS_STATUS SfcRenderXe_Xpm_Base::SetMmcParams(PMOS_SURFACE renderTarget, bool isFormatMmcSupported, bool isMmcEnabled)
 {
+    VP_FUNC_CALL();
+    VP_PUBLIC_CHK_NULL_RETURN(renderTarget);
+    VP_PUBLIC_CHK_NULL_RETURN(m_renderDataLegacy.sfcStateParams);
+
     if (((renderTarget->Format == Format_A16R16G16B16) ||
         (renderTarget->Format == Format_A16B16G16R16)) &&
         renderTarget->CompressionMode == MOS_MMC_RC)
     {
         m_renderDataLegacy.sfcStateParams->bMMCEnable = true;
         m_renderDataLegacy.sfcStateParams->MMCMode    = MOS_MMC_RC;
-        VP_RENDER_NORMALMESSAGE("renderTarget->Format % d, m_renderData.sfcStateParams->MMCMode % d", renderTarget->Format, m_renderData.sfcStateParams->MMCMode);
+        VP_RENDER_NORMALMESSAGE("renderTarget->Format % d, m_renderDataLegacy.sfcStateParams->MMCMode % d", renderTarget->Format, m_renderDataLegacy.sfcStateParams->MMCMode);
         return MOS_STATUS_SUCCESS;
     }
 
diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/codec/hal/dec/jpeg/pipeline/media_srcs.cmake b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/codec/hal/dec/jpeg/pipeline/media_srcs.cmake
@@ -18,7 +18,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-if(${AVC_Decode_Supported} STREQUAL "yes")
+if(${JPEG_Decode_Supported} STREQUAL "yes")
 set(SOFTLET_DECODE_JPEG_SOURCES_
     ${SOFTLET_DECODE_JPEG_SOURCES_}
     ${CMAKE_CURRENT_LIST_DIR}/decode_jpeg_pipeline_xe3_lpm_base.cpp
diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/hw/vdbox/mhw_vdbox_vdenc_impl_xe_lpm_plus_base.h b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus_base/hw/vdbox/mhw_vdbox_vdenc_impl_xe_lpm_plus_base.h
@@ -110,6 +110,16 @@ class BaseImplGeneric : public vdenc::Impl<cmd_t>
 
         return MOS_STATUS_SUCCESS;
     }
+    _MHW_SETCMD_OVERRIDE_DECL(VDENC_AVC_IMG_STATE)
+    {
+        _MHW_SETCMD_CALLBASE(VDENC_AVC_IMG_STATE);
+
+#define DO_FIELDS_EXT() \
+        __MHW_VDBOX_VDENC_WRAPPER_EXT(VDENC_AVC_IMG_STATE_IMPL_XE_LPM_BASE_EXT)
+
+#include "mhw_hwcmd_process_cmdfields.h"
+    }
+
 MEDIA_CLASS_DEFINE_END(mhw__vdbox__vdenc__xe_lpm_plus_base__BaseImplGeneric)
 };
 }  // namespace xe_lpm_plus_base
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
@@ -687,6 +687,10 @@ MOS_STATUS SfcRenderXe_Lpm_Plus_Base::AddSfcState(
 
 MOS_STATUS SfcRenderXe_Lpm_Plus_Base::SetMmcParams(PMOS_SURFACE renderTarget, bool isFormatMmcSupported, bool isMmcEnabled)
 {
+    VP_FUNC_CALL();
+    VP_PUBLIC_CHK_NULL_RETURN(renderTarget);
+    VP_PUBLIC_CHK_NULL_RETURN(m_renderData.sfcStateParams);
+
     if (((renderTarget->Format == Format_A16R16G16B16) ||
         (renderTarget->Format == Format_A16B16G16R16)) &&
         renderTarget->CompressionMode == MOS_MMC_RC)
diff --git a/media_softlet/agnostic/common/hw/mhw_vebox_impl.h b/media_softlet/agnostic/common/hw/mhw_vebox_impl.h
@@ -901,6 +901,7 @@ class Impl : public Itf, public mhw::Impl
         {
             MHW_CHK_NULL_RETURN(m_veboxHeap);
             MHW_CHK_NULL_RETURN(m_veboxHeap->pStates);
+            uint32_t reportedUsedID = 0;
             for (uint32_t index = 0; index < m_veboxSettings.uiNumInstances; index++)
             {
                 const MHW_VEBOX_HEAP_STATE &curInstance = m_veboxHeap->pStates[index];
@@ -909,10 +910,21 @@ class Impl : public Itf, public mhw::Impl
                     m_usedVeboxID |= 1 << (*curInstance.engineData).instanceId;
                 }
             }
+            // It is only used in debugging scenarios for multi-Vebox platforms.
+            // No need to add any locks here.
+            // This approach can handle all current debugging scenarios with multiple threads/processes.
+            ReadUserSettingForDebug(
+                m_userSettingPtr,
+                reportedUsedID,
+                __MEDIA_USER_FEATURE_VALUE_USED_VEBOX_ID,
+                MediaUserSetting::Group::Sequence,
+                0,
+                false,
+                MEDIA_USER_SETTING_INTERNAL_REPORT);
             ReportUserSettingForDebug(
                 m_userSettingPtr,
                 __MEDIA_USER_FEATURE_VALUE_USED_VEBOX_ID,
-                m_usedVeboxID,
+                reportedUsedID | m_usedVeboxID,
                 MediaUserSetting::Group::Sequence);
         }
         return MOS_STATUS_SUCCESS;
diff --git a/media_softlet/linux/common/ddi/capstable_data_image_format_definition.h b/media_softlet/linux/common/ddi/capstable_data_image_format_definition.h
@@ -29,13 +29,14 @@
 
 #include "va/va.h"
 
-static VAImageFormat formatBGRA        = {VA_FOURCC_BGRA,        VA_LSB_FIRST,  32, 32, 0x0000ff00, 0x00ff0000, 0xff000000,  0x000000ff }; /* [31:0] B:G:R:A 8:8:8:8 little endian */
+// "VA_LSB_FIRST" is to identify how following bit masks mapped to address instead of char order in VA_FOURCC_RGBA naming.
+static VAImageFormat formatBGRA        = {VA_FOURCC_BGRA,        VA_LSB_FIRST,  32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff,  0xff000000}; /* [31:0] A:R:G:B 8:8:8:8 little endian */
 static VAImageFormat formatARGB        = {VA_FOURCC_ARGB,        VA_LSB_FIRST,  32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff,  0xff000000 }; /* [31:0] A:R:G:B 8:8:8:8 little endian */
-static VAImageFormat formatRGBA        = {VA_FOURCC_RGBA,        VA_LSB_FIRST,  32, 32, 0xff000000, 0x00ff0000, 0x0000ff00,  0x000000ff }; /* [31:0] R:G:B:A 8:8:8:8 little endian */
+static VAImageFormat formatRGBA        = {VA_FOURCC_RGBA,        VA_LSB_FIRST,  32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000,  0xff000000}; /* [31:0] A:B:G:R 8:8:8:8 little endian */
 static VAImageFormat formatABGR        = {VA_FOURCC_ABGR,        VA_LSB_FIRST,  32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000,  0xff000000 }; /* [31:0] A:B:G:R 8:8:8:8 little endian */
-static VAImageFormat formatBGRX        = {VA_FOURCC_BGRX,        VA_LSB_FIRST,  32, 24, 0x0000ff00, 0x00ff0000, 0xff000000,  0 };          /* [31:0] B:G:R:x 8:8:8:8 little endian */
+static VAImageFormat formatBGRX        = {VA_FOURCC_BGRX,        VA_LSB_FIRST,  32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff,  0};          /* [31:0] X:R:G:B 8:8:8:8 little endian */
 static VAImageFormat formatXRGB        = {VA_FOURCC_XRGB,        VA_LSB_FIRST,  32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff,  0 };          /* [31:0] x:R:G:B 8:8:8:8 little endian */
-static VAImageFormat formatRGBX        = {VA_FOURCC_RGBX,        VA_LSB_FIRST,  32, 24, 0xff000000, 0x00ff0000, 0x0000ff00,  0 };          /* [31:0] R:G:B:x 8:8:8:8 little endian */
+static VAImageFormat formatRGBX        = {VA_FOURCC_RGBX,        VA_LSB_FIRST,  32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000,  0};          /* [31:0] X:B:G:R 8:8:8:8 little endian */
 static VAImageFormat formatXBGR        = {VA_FOURCC_XBGR,        VA_LSB_FIRST,  32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000,  0 };          /* [31:0] x:B:G:R 8:8:8:8 little endian */
 static VAImageFormat formatA2R10G10B10 = {VA_FOURCC_A2R10G10B10, VA_LSB_FIRST,  32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff,  0x30000000 }; /* [31:0] A:R:G:B 2:10:10:10 little endian */
 static VAImageFormat formatA2B10G10R10 = {VA_FOURCC_A2B10G10R10, VA_LSB_FIRST,  32, 30, 0x000003ff, 0x000ffc00, 0x3ff00000,  0x30000000 }; /* [31:0] A:B:G:R 2:10:10:10 little endian */
@@ -70,4 +71,4 @@ static VAImageFormat formatY416        = {VA_FOURCC_Y416,        VA_LSB_FIRST,
 static VAImageFormat formatRGBP        = {VA_FOURCC_RGBP,        VA_LSB_FIRST,  24, 24,0,0,0,0};
 static VAImageFormat formatBGRP        = {VA_FOURCC_BGRP,        VA_LSB_FIRST,  24, 24,0,0,0,0};
 
-#endif //__CAPSTABLE_DATA_IMAGE_FORMAT_DEFINITION_H__
+#endif //__CAPSTABLE_DATA_IMAGE_FORMAT_DEFINITION_H__
diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
@@ -1537,10 +1537,6 @@ VAStatus MediaLibvaUtilNext::CreateShadowResource(DDI_MEDIA_SURFACE *surface)
     DDI_FUNC_ENTER;
     DDI_CHK_NULL(surface, "nullptr surface", VA_STATUS_ERROR_INVALID_SURFACE);
     DDI_CHK_NULL(surface->pGmmResourceInfo, "nullptr surface->pGmmResourceInfo", VA_STATUS_ERROR_INVALID_SURFACE);
-    if (surface->pGmmResourceInfo->GetSetCpSurfTag(0, 0) != 0)
-    {
-        return VA_STATUS_ERROR_INVALID_SURFACE;
-    }
 
     if (surface->iWidth < 64 || surface->iRealHeight < 64 || (surface->iPitch % 64 != 0) || surface->format == Media_Format_P016)
     {
@@ -2260,7 +2256,7 @@ VAStatus MediaLibvaUtilNext::GetSurfaceModifier(
         switch(gmmTileType)
         {
             case GMM_TILED_4:
-                modifier = gmmFlags.Info.MediaCompressed ? compressedModifier : I915_FORMAT_MOD_4_TILED;
+                modifier = gmmFlags.Info.NotCompressed ? I915_FORMAT_MOD_4_TILED : compressedModifier;
                 break;
             case GMM_TILED_Y:
                 modifier = I915_FORMAT_MOD_Y_TILED;
@@ -2275,7 +2271,7 @@ VAStatus MediaLibvaUtilNext::GetSurfaceModifier(
                 //handle other possible tile format
                 if(TILING_Y == mediaSurface->TileType)
                 {
-                    modifier = gmmFlags.Info.MediaCompressed ? compressedModifier : I915_FORMAT_MOD_4_TILED;
+                    modifier = gmmFlags.Info.NotCompressed ? I915_FORMAT_MOD_4_TILED : compressedModifier;
                 }
                 else
                 {
diff --git a/media_softlet/linux/xe_lpm_plus_r0/encode/av1/ddi/capstable_data_av1_encode_xe_lpm_plus_r0_specific.h b/media_softlet/linux/xe_lpm_plus_r0/encode/av1/ddi/capstable_data_av1_encode_xe_lpm_plus_r0_specific.h
@@ -66,7 +66,7 @@ static ConfigDataList configDataList_VAProfileAV1Profile0_VAEntrypointEncSlice_X
 //!
 static const AttribList attribList_VAProfileAV1Profile0_VAEntrypointEncSlice_Xe_Lpm_plus_r0
 {
-   {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_YUV420_10},
+   {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_YUV420_10 | VA_RT_FORMAT_RGB32 | VA_RT_FORMAT_RGB32_10BPP},
    {VAConfigAttribEncDynamicScaling, 0},
    {VAConfigAttribEncDirtyRect, VA_ATTRIB_NOT_SUPPORTED},
    {VAConfigAttribEncAV1Ext2, VAProfileAV1Profile0_VAEntrypointEncSlice_encAV1Ext2.value},

Original file line number	Diff line number	Diff line change
`@@ -311,13 +311,17 @@ bool SfcRenderXe_Xpm_Base::IsCscNeeded(SFC_CSC_PARAMS &cscParams)`
`311`	`311`
`312`	`312`	`MOS_STATUS SfcRenderXe_Xpm_Base::SetMmcParams(PMOS_SURFACE renderTarget, bool isFormatMmcSupported, bool isMmcEnabled)`
`313`	`313`	`{`
	`314`	`+ VP_FUNC_CALL();`
	`315`	`+ VP_PUBLIC_CHK_NULL_RETURN(renderTarget);`
	`316`	`+ VP_PUBLIC_CHK_NULL_RETURN(m_renderDataLegacy.sfcStateParams);`
	`317`	`+`
`314`	`318`	`if (((renderTarget->Format == Format_A16R16G16B16) \|\|`
`315`	`319`	`(renderTarget->Format == Format_A16B16G16R16)) &&`
`316`	`320`	`renderTarget->CompressionMode == MOS_MMC_RC)`
`317`	`321`	`{`
`318`	`322`	`m_renderDataLegacy.sfcStateParams->bMMCEnable = true;`
`319`	`323`	`m_renderDataLegacy.sfcStateParams->MMCMode = MOS_MMC_RC;`
`320`		`- VP_RENDER_NORMALMESSAGE("renderTarget->Format % d, m_renderData.sfcStateParams->MMCMode % d", renderTarget->Format, m_renderData.sfcStateParams->MMCMode);`
	`324`	`+ VP_RENDER_NORMALMESSAGE("renderTarget->Format % d, m_renderDataLegacy.sfcStateParams->MMCMode % d", renderTarget->Format, m_renderDataLegacy.sfcStateParams->MMCMode);`
`321`	`325`	`return MOS_STATUS_SUCCESS;`
`322`	`326`	`}`
`323`	`327`
Original file line number	Diff line number	Diff line change
`@@ -1537,10 +1537,6 @@ VAStatus MediaLibvaUtilNext::CreateShadowResource(DDI_MEDIA_SURFACE *surface)`
`1537`	`1537`	`DDI_FUNC_ENTER;`
`1538`	`1538`	`DDI_CHK_NULL(surface, "nullptr surface", VA_STATUS_ERROR_INVALID_SURFACE);`
`1539`	`1539`	`DDI_CHK_NULL(surface->pGmmResourceInfo, "nullptr surface->pGmmResourceInfo", VA_STATUS_ERROR_INVALID_SURFACE);`
`1540`		`- if (surface->pGmmResourceInfo->GetSetCpSurfTag(0, 0) != 0)`
`1541`		`- {`
`1542`		`- return VA_STATUS_ERROR_INVALID_SURFACE;`
`1543`		`- }`
`1544`	`1540`
`1545`	`1541`	`if (surface->iWidth < 64 \|\| surface->iRealHeight < 64 \|\| (surface->iPitch % 64 != 0) \|\| surface->format == Media_Format_P016)`
`1546`	`1542`	`{`
`@@ -2260,7 +2256,7 @@ VAStatus MediaLibvaUtilNext::GetSurfaceModifier(`
`2260`	`2256`	`switch(gmmTileType)`
`2261`	`2257`	`{`
`2262`	`2258`	`case GMM_TILED_4:`
`2263`		`- modifier = gmmFlags.Info.MediaCompressed ? compressedModifier : I915_FORMAT_MOD_4_TILED;`
	`2259`	`+ modifier = gmmFlags.Info.NotCompressed ? I915_FORMAT_MOD_4_TILED : compressedModifier;`
`2264`	`2260`	`break;`
`2265`	`2261`	`case GMM_TILED_Y:`
`2266`	`2262`	`modifier = I915_FORMAT_MOD_Y_TILED;`
`@@ -2275,7 +2271,7 @@ VAStatus MediaLibvaUtilNext::GetSurfaceModifier(`
`2275`	`2271`	`//handle other possible tile format`
`2276`	`2272`	`if(TILING_Y == mediaSurface->TileType)`
`2277`	`2273`	`{`
`2278`		`- modifier = gmmFlags.Info.MediaCompressed ? compressedModifier : I915_FORMAT_MOD_4_TILED;`
	`2274`	`+ modifier = gmmFlags.Info.NotCompressed ? I915_FORMAT_MOD_4_TILED : compressedModifier;`
`2279`	`2275`	`}`
`2280`	`2276`	`else`
`2281`	`2277`	`{`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ static ConfigDataList configDataList_VAProfileAV1Profile0_VAEntrypointEncSlice_X`
`66`	`66`	`//!`
`67`	`67`	`static const AttribList attribList_VAProfileAV1Profile0_VAEntrypointEncSlice_Xe_Lpm_plus_r0`
`68`	`68`	`{`
`69`		`- {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420 \| VA_RT_FORMAT_YUV420_10},`
	`69`	`+ {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420 \| VA_RT_FORMAT_YUV420_10 \| VA_RT_FORMAT_RGB32 \| VA_RT_FORMAT_RGB32_10BPP},`
`70`	`70`	`{VAConfigAttribEncDynamicScaling, 0},`
`71`	`71`	`{VAConfigAttribEncDirtyRect, VA_ATTRIB_NOT_SUPPORTED},`
`72`	`72`	`{VAConfigAttribEncAV1Ext2, VAProfileAV1Profile0_VAEntrypointEncSlice_encAV1Ext2.value},`