Handle Coherent and compressible resources (#235)

Author: johnmach

Source/GmmLib/CachePolicy/GmmXe2_LPGCachePolicy.cpp

@@ -400,10 +400,20 @@ uint32_t GMM_STDCALL GmmLib::GmmXe2_LPGCachePolicy::CachePolicyGetPATIndex(GMM_R
     // requested compressed and coherent
     if (CompressionEnable && IsCpuCacheable)
     {
-	// return coherent uncompressed
-	ReturnPATIndex    = CoherentPATIndex;
-	CompressionEnable = false;
-	GMM_ASSERTDPF(false, "Coherent Compressed is not supported on Xe2. However, respecting the coherency and returning CoherentPATIndex");
+        if (ONE_WAY_COHERENT_COMPRESSION_MODE(pGmmLibContext->GetPlatformInfo().Platform.eProductFamily, pGmmLibContext->GetWaTable().WaNoCpuCoherentCompression))
+        {
+#define COHERENT_COMPRESSED_PATIDX 16
+            // return coherent compressed PAT which is 16
+            ReturnPATIndex    = COHERENT_COMPRESSED_PATIDX;
+            CompressionEnable = true;
+        }
+        else
+        {
+            // return coherent uncompressed
+            ReturnPATIndex    = CoherentPATIndex;
+            CompressionEnable = false;
+            GMM_ASSERTDPF(false, "For Coherent Compressed resources combination on Xe2, respecting the coherency and returning CoherentPATIndex");
+        }
     }
     // requested compressed only
     else if (CompressionEnable)
@@ -605,6 +615,11 @@ GMM_STATUS GmmLib::GmmXe2_LPGCachePolicy::SetupPAT()
 
     CurrentMaxPATIndex = 31;
 
+    if (ONE_WAY_COHERENT_COMPRESSION_MODE(pGmmLibContext->GetPlatformInfo().Platform.eProductFamily, pGmmLibContext->GetWaTable().WaNoCpuCoherentCompression))
+    {
+        GMM_DEFINE_PAT_ELEMENT( 16      , 2      , L4_UC              , L3_WB           , 0          , 1             , 0)    //          | L3_WB | 1 way coherent | Compression
+    }
+
 // clang-format on
 #undef GMM_DEFINE_PAT
 #undef L4_WB

Source/GmmLib/Resource/GmmResourceInfoCommonEx.cpp

@@ -265,6 +265,20 @@ bool GmmLib::GmmResourceInfoCommon::CopyClientParams(GMM_RESCREATE_PARAMS &Creat
     Surf.Flags.Info.SVM &&
     !(GetGmmLibContext()->GetSkuTable().FtrWddm2GpuMmu ||
       GetGmmLibContext()->GetSkuTable().FtrWddm2Svm);
+    
+    if (GetGmmLibContext()->GetSkuTable().FtrXe2Compression && 
+		    !(ONE_WAY_COHERENT_COMPRESSION_MODE(GetGmmLibContext()->GetPlatformInfo().Platform.eProductFamily, GetGmmLibContext()->GetWaTable().WaNoCpuCoherentCompression)))
+    {
+        if (!CreateParams.Flags.Info.NotCompressed && CreateParams.Flags.Info.Cacheable)
+        {
+            // Disable compression
+            Surf.Flags.Info.NotCompressed     = 1;
+            Surf.Flags.Gpu.CCS                = 0;
+            Surf.Flags.Gpu.UnifiedAuxSurface  = 0;
+            Surf.Flags.Gpu.IndirectClearColor = 0;
+            Surf.Flags.Gpu.MCS                = 0;
+        }
+    }    
 
 #if !__GMM_KMD__ && LHDM
     if(GetGmmLibContext()->GetWaTable().WaLLCCachingUnsupported)
@@ -1023,6 +1037,14 @@ uint8_t GMM_STDCALL GmmLib::GmmResourceInfoCommon::ValidateParams()
             break;
     }
 
+    if (GetGmmLibContext()->GetSkuTable().FtrXe2Compression && 
+		    !(ONE_WAY_COHERENT_COMPRESSION_MODE(GetGmmLibContext()->GetPlatformInfo().Platform.eProductFamily, GetGmmLibContext()->GetWaTable().WaNoCpuCoherentCompression)) && 
+		    Surf.Flags.Info.Cacheable && !Surf.Flags.Info.NotCompressed)
+    {
+        GMM_ASSERTDPF(0, "Invalid combination Cpu Cacheable and Compression set on a platform");
+        goto ERROR_CASE;
+    }
+
     GMM_DPF_EXIT;
     return 1;
 

Source/GmmLib/inc/External/Common/GmmUtil.h

@@ -106,3 +106,4 @@ OTHER DEALINGS IN THE SOFTWARE.
 #define GMM_OVERRIDE_SIZE_64KB_ALLOC(pGmmLibContext)  if(((GmmClientContext*)pClientContext)->GetSkuTable().FtrPpgtt64KBWalkOptimization){ return (this->GetSizeAllocation());}
 #endif
 
+#define ONE_WAY_COHERENT_COMPRESSION_MODE(Platform, WaNoCpuCoherentCompression) ((Platform >= IGFX_PTL) && (!WaNoCpuCoherentCompression))

Source/inc/common/sku_wa.h

@@ -569,6 +569,12 @@ typedef struct _WA_TABLE
         "WA for supporting failure seen in BMG with Mufasa",
         WA_BUG_TYPE_FUNCTIONAL,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)	
+	
+	WA_DECLARE(
+        WaNoCpuCoherentCompression,
+        "Deny compression for coherent surfaces",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
 } WA_TABLE, *PWA_TABLE;