commit 12e141dc296d75bd68be81e1708e44b22fae4899
author jianxing cai <jianxing.cai@intel.com> Wed Feb 15 15:10:06 2023 +0800
committer intel-mediadev <mediadev@intel.com> Fri Mar 17 01:10:05 2023 +0800
tree 993fcae274cc79af7b678798f0ccadeac9341eb3
parent fe3b5f864e3a3f8f00cb32fa1202698a0b1f62a0

use possible upstream definition of CCS modifier

description: use possible upstream definition of CCS modifier
Signed-off-by: Jianxing Cai jianxing.cai@intel.com

media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp

diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp
index 60ef80a..b11887c 100644
--- a/media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp
+++ b/media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp
@@ -99,11 +99,11 @@
     (fourcc_mod_code(INTEL, (val)) | INTEL_PRELIM_ID_FLAG)
 
 /* this definition is to avoid duplicate drm_fourcc.h this file is updated seldom */
-#ifndef PRELIM_I915_FORMAT_MOD_4_TILED_MTL_MC_CCS
-#define PRELIM_I915_FORMAT_MOD_4_TILED_MTL_MC_CCS    intel_prelim_fourcc_mod_code(17)
+#ifndef I915_FORMAT_MOD_4_TILED_MTL_MC_CCS
+#define I915_FORMAT_MOD_4_TILED_MTL_MC_CCS    fourcc_mod_code(INTEL, 14)
 #endif
-#ifndef PRELIM_I915_FORMAT_MOD_4_TILED_MTL_RC_CCS
-#define PRELIM_I915_FORMAT_MOD_4_TILED_MTL_RC_CCS    intel_prelim_fourcc_mod_code(16)
+#ifndef I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC
+#define I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC    fourcc_mod_code(INTEL, 15)
 #endif
 
 extern template class MediaLibvaCapsFactory<MediaLibvaCaps, DDI_MEDIA_CONTEXT>;
@@ -2660,8 +2660,8 @@
     {
         if(m_mediaCtx->m_auxTableMgr && bMmcEnabled)
         {
-            modifier = GmmFlags.Info.MediaCompressed ? PRELIM_I915_FORMAT_MOD_4_TILED_MTL_MC_CCS :
-                (GmmFlags.Info.RenderCompressed ? PRELIM_I915_FORMAT_MOD_4_TILED_MTL_RC_CCS : I915_FORMAT_MOD_4_TILED);
+            modifier = GmmFlags.Info.MediaCompressed ? I915_FORMAT_MOD_4_TILED_MTL_MC_CCS :
+                (GmmFlags.Info.RenderCompressed ? I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC : I915_FORMAT_MOD_4_TILED);
         }
         else
         {
@@ -2686,12 +2686,12 @@
             tileformat = I915_TILING_Y;
             bMemCompEnable = false;
             break;
-        case PRELIM_I915_FORMAT_MOD_4_TILED_MTL_RC_CCS:
+        case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC:
             tileformat = I915_TILING_Y;
             bMemCompEnable = true;
             bMemCompRC = true;
             break;
-        case PRELIM_I915_FORMAT_MOD_4_TILED_MTL_MC_CCS:
+        case I915_FORMAT_MOD_4_TILED_MTL_MC_CCS:
             tileformat = I915_TILING_Y;
             bMemCompEnable = true;
             bMemCompRC = false;

media_softlet/linux/common/ddi/media_libva_util_next.cpp

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 6232b4e..1fc9e5f 100644
--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp
+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
@@ -45,11 +45,11 @@
     (fourcc_mod_code(INTEL, (val)) | INTEL_PRELIM_ID_FLAG)
 
 /* this definition is to avoid duplicate drm_fourcc.h this file is updated seldom */
-#ifndef PRELIM_I915_FORMAT_MOD_4_TILED_MTL_MC_CCS
-#define PRELIM_I915_FORMAT_MOD_4_TILED_MTL_MC_CCS    intel_prelim_fourcc_mod_code(17)
+#ifndef I915_FORMAT_MOD_4_TILED_MTL_MC_CCS
+#define I915_FORMAT_MOD_4_TILED_MTL_MC_CCS    fourcc_mod_code(INTEL, 14)
 #endif
-#ifndef PRELIM_I915_FORMAT_MOD_4_TILED_MTL_RC_CCS
-#define PRELIM_I915_FORMAT_MOD_4_TILED_MTL_RC_CCS    intel_prelim_fourcc_mod_code(16)
+#ifndef I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC
+#define I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC    fourcc_mod_code(INTEL, 15)
 #endif
 
 // default protected surface tag
@@ -233,12 +233,12 @@
             params.tileFormat = I915_TILING_Y;
             params.bMemCompEnable = false;
             break;
-        case PRELIM_I915_FORMAT_MOD_4_TILED_MTL_RC_CCS:
+        case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC:
             params.tileFormat = I915_TILING_Y;
             params.bMemCompEnable = true;
             params.bMemCompRC = true;
             break;
-        case PRELIM_I915_FORMAT_MOD_4_TILED_MTL_MC_CCS:
+        case I915_FORMAT_MOD_4_TILED_MTL_MC_CCS:
             params.tileFormat = I915_TILING_Y;
             params.bMemCompEnable = true;
             params.bMemCompRC = false;
@@ -1944,8 +1944,8 @@
         case GMM_TILED_4:
             if(mediaCtx->m_auxTableMgr && bMmcEnabled)
             {
-                modifier = gmmFlags.Info.MediaCompressed ? PRELIM_I915_FORMAT_MOD_4_TILED_MTL_MC_CCS :
-                    (gmmFlags.Info.RenderCompressed ? PRELIM_I915_FORMAT_MOD_4_TILED_MTL_RC_CCS : I915_FORMAT_MOD_4_TILED);
+                modifier = gmmFlags.Info.MediaCompressed ? I915_FORMAT_MOD_4_TILED_MTL_MC_CCS :
+                    (gmmFlags.Info.RenderCompressed ? I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC : I915_FORMAT_MOD_4_TILED);
             }
             else
             {