From 9b35e3fc739ded0f5d9260e569d09f9f713ddbcf Mon Sep 17 00:00:00 2001
From: Bai_Guiangyao <guangyao.bai@intel.com>
Date: Thu, 12 Dec 2024 19:17:07 +0800
Subject: [PATCH] [Media Common] [VP] Update Linux Settings for compression on
 Xe2+

Update Linux Settings for compression on Xe2+, missed FtrXe2Compression in system info flags
---
 media_softlet/linux/xe2_hpm/ddi/media_sku_wa_bmg.cpp  | 8 ++------
 media_softlet/linux/xe2_hpm/ddi/media_sysinfo_bmg.cpp | 2 ++
 media_softlet/linux/xe2_lpm/ddi/media_sku_wa_lnl.cpp  | 8 ++------
 media_softlet/linux/xe2_lpm/ddi/media_sysinfo_lnl.cpp | 1 +
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/media_softlet/linux/xe2_hpm/ddi/media_sku_wa_bmg.cpp b/media_softlet/linux/xe2_hpm/ddi/media_sku_wa_bmg.cpp
index 5ac460e18fe..11229bb291b 100644
--- a/media_softlet/linux/xe2_hpm/ddi/media_sku_wa_bmg.cpp
+++ b/media_softlet/linux/xe2_hpm/ddi/media_sku_wa_bmg.cpp
@@ -196,6 +196,7 @@ static bool InitBmgMediaSkuExt(struct GfxDeviceInfo *devInfo,
     MEDIA_WR_SKU(skuTable, FtrWithSlimVdbox, 0);
 
     MEDIA_WR_SKU(skuTable, FtrE2ECompression, 1);
+    MEDIA_WR_SKU(skuTable, FtrXe2Compression , 1);
     MEDIA_WR_SKU(skuTable, FtrHDR, 1);
     MEDIA_WR_SKU(skuTable, FtrDisableRenderTargetWidthAdjust, 1);
 
@@ -210,6 +211,7 @@ static bool InitBmgMediaSkuExt(struct GfxDeviceInfo *devInfo,
     if (userFeatureData.bData)
     {
         MEDIA_WR_SKU(skuTable, FtrE2ECompression, 0);
+        MEDIA_WR_SKU(skuTable, FtrXe2Compression , 0);
     }
 
     // Create uncompressible surface by default
@@ -235,14 +237,8 @@ static bool InitBmgMediaSkuExt(struct GfxDeviceInfo *devInfo,
     MEDIA_WR_SKU(skuTable, FtrUseSwSwizzling, 0);
     MEDIA_WR_SKU(skuTable, FtrMemoryRemapSupport, 1);
 
-
     MEDIA_WR_SKU(skuTable, FtrAV1VLDLSTDecoding, 1);
     MEDIA_WR_SKU(skuTable, FtrMediaIPSeparation , 1);
-    MEDIA_WR_SKU(skuTable, FtrXe2Compression , 1);
-    if (!compressibleSurfaceEnable)
-    {
-        MEDIA_WR_SKU(skuTable, FtrXe2Compression , 0);
-    }
 
     return true;
 }
diff --git a/media_softlet/linux/xe2_hpm/ddi/media_sysinfo_bmg.cpp b/media_softlet/linux/xe2_hpm/ddi/media_sysinfo_bmg.cpp
index cce03d1f828..7b14b0e8248 100644
--- a/media_softlet/linux/xe2_hpm/ddi/media_sysinfo_bmg.cpp
+++ b/media_softlet/linux/xe2_hpm/ddi/media_sysinfo_bmg.cpp
@@ -109,6 +109,7 @@ static bool InitBmgShadowSku(struct GfxDeviceInfo *devInfo,
 
     bool disableMMC     = false;
     skuTable->FtrE2ECompression = 1;
+    skuTable->FtrXe2Compression = 1;
     // Disable MMC for all components if set reg key
     MOS_USER_FEATURE_VALUE_DATA userFeatureData;
     MOS_ZeroMemory(&userFeatureData, sizeof(userFeatureData));
@@ -125,6 +126,7 @@ static bool InitBmgShadowSku(struct GfxDeviceInfo *devInfo,
     if (disableMMC)
     {
         skuTable->FtrE2ECompression = 0;
+        skuTable->FtrXe2Compression = 0;
     }
 
     skuTable->FtrLinearCCS = 1;
diff --git a/media_softlet/linux/xe2_lpm/ddi/media_sku_wa_lnl.cpp b/media_softlet/linux/xe2_lpm/ddi/media_sku_wa_lnl.cpp
index 7688b06f0f9..63e37766377 100644
--- a/media_softlet/linux/xe2_lpm/ddi/media_sku_wa_lnl.cpp
+++ b/media_softlet/linux/xe2_lpm/ddi/media_sku_wa_lnl.cpp
@@ -199,6 +199,7 @@ static bool InitLnlMediaSkuExt(struct GfxDeviceInfo *devInfo,
     MEDIA_WR_SKU(skuTable, FtrWithSlimVdbox, 0);
 
     MEDIA_WR_SKU(skuTable, FtrE2ECompression, 1);
+    MEDIA_WR_SKU(skuTable, FtrXe2Compression , 1);
     MEDIA_WR_SKU(skuTable, FtrHDR, 1);
     MEDIA_WR_SKU(skuTable, FtrDisableRenderTargetWidthAdjust, 1);
 
@@ -213,6 +214,7 @@ static bool InitLnlMediaSkuExt(struct GfxDeviceInfo *devInfo,
     if (userFeatureData.bData)
     {
         MEDIA_WR_SKU(skuTable, FtrE2ECompression, 0);
+        MEDIA_WR_SKU(skuTable, FtrXe2Compression , 0);
     }
 
     // Create uncompressible surface by default
@@ -239,14 +241,8 @@ static bool InitLnlMediaSkuExt(struct GfxDeviceInfo *devInfo,
     MEDIA_WR_SKU(skuTable, FtrUseSwSwizzling, 0);
     MEDIA_WR_SKU(skuTable, FtrMemoryRemapSupport, 1);
 
-
     MEDIA_WR_SKU(skuTable, FtrAV1VLDLSTDecoding, 1);
     MEDIA_WR_SKU(skuTable, FtrMediaIPSeparation , 1);
-    MEDIA_WR_SKU(skuTable, FtrXe2Compression , 1);
-    if (!compressibleSurfaceEnable)
-    {
-        MEDIA_WR_SKU(skuTable, FtrXe2Compression , 0);
-    }
 
     return true;
 }
diff --git a/media_softlet/linux/xe2_lpm/ddi/media_sysinfo_lnl.cpp b/media_softlet/linux/xe2_lpm/ddi/media_sysinfo_lnl.cpp
index 661fb523411..b768264092f 100644
--- a/media_softlet/linux/xe2_lpm/ddi/media_sysinfo_lnl.cpp
+++ b/media_softlet/linux/xe2_lpm/ddi/media_sysinfo_lnl.cpp
@@ -109,6 +109,7 @@ static bool InitLnlShadowSku(struct GfxDeviceInfo *devInfo,
 
     bool disableMMC = false;
     skuTable->FtrE2ECompression = 1;
+    skuTable->FtrXe2Compression = 1;
     // Disable MMC for all components if set reg key
     MOS_USER_FEATURE_VALUE_DATA userFeatureData;
     MOS_ZeroMemory(&userFeatureData, sizeof(userFeatureData));