Skip to content

Commit 1ed3f87

Browse files
johnmachjohnmach
authored
Introduce Battlemage full support (#205)
1 parent a999c84 commit 1ed3f87

12 files changed

+115
-44
lines changed

‎Source/GmmLib/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ project(igfx_gmmumd)
2525

2626
# GmmLib Api Version used for so naming
2727
set(GMMLIB_API_MAJOR_VERSION 12)
28-
set(GMMLIB_API_MINOR_VERSION 4)
28+
set(GMMLIB_API_MINOR_VERSION 5)
2929

3030
if(NOT DEFINED MAJOR_VERSION)
3131
set(MAJOR_VERSION 12)
3232
endif()
3333

3434
if(NOT DEFINED MINOR_VERSION)
35-
set(MINOR_VERSION 4)
35+
set(MINOR_VERSION 5)
3636
endif()
3737

3838
if(NOT DEFINED PATCH_VERSION)

‎Source/GmmLib/CachePolicy/GmmXe2_LPGCachePolicy.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,16 @@ void GmmLib::GmmXe2_LPGCachePolicy::GetL3L4(GMM_CACHE_POLICY_TBL_ELEMENT *pUsage
334334
break;
335335
}
336336

337-
337+
if (pGmmLibContext->GetWaTable().Wa_14018443005 &&
338+
(pCachePolicy[Usage].L3CC == GMM_UC) &&
339+
(ISWA_1401844305USAGE(Usage)) &&
340+
(pGmmLibContext->GetClientType() != GMM_KMD_VISTA) &&
341+
(pGmmLibContext->GetClientType() != GMM_OCL_VISTA))
342+
{
343+
pUsageEle->L3.PhysicalL3.L3CC = GMM_GFX_PHY_L3_MT_WB;
344+
pUsagePATElement->Xe2.L3CC = GMM_GFX_PHY_L3_MT_WB;
345+
pCachePolicy[Usage].L3CC = GMM_WB;
346+
}
338347
}
339348

340349
/////////////////////////////////////////////////////////////////////////////////////
@@ -435,14 +444,6 @@ uint32_t GMM_STDCALL GmmLib::GmmXe2_LPGCachePolicy::CachePolicyGetPATIndex(GMM_R
435444
*pCompressionEnable = CompressionEnable;
436445
}
437446

438-
#define COMPRESSED_PAT_WITH_L3_UC_0 10
439-
#define COMPRESSED_PAT_WITH_L3_UC_1 12
440-
//PAT index with compression + L3:UC not allowed.
441-
if (pGmmLibContext->GetWaTable().Wa_14018443005 && CompressionEnable)
442-
{
443-
__GMM_ASSERT(!((ReturnPATIndex == COMPRESSED_PAT_WITH_L3_UC_0) || (ReturnPATIndex == COMPRESSED_PAT_WITH_L3_UC_1)));
444-
}
445-
446447
return ReturnPATIndex;
447448
}
448449

‎Source/GmmLib/CachePolicy/GmmXe2_LPGCachePolicy.h

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ OTHER DEALINGS IN THE SOFTWARE.
2525
#define _WT 0x2
2626
#define _L1_WB 0x2
2727
#define dGPU SKU(FtrDiscrete)
28-
#define _WA_WB (WA(Wa_14018443005))
28+
29+
#if (_DEBUG || _RELEASE_INTERNAL)
30+
#define _WA_WB_Emu (WA(Wa_EmuMufasaSupportOnBmg))
31+
#else
32+
#define _WA_WB_Emu 0
33+
#endif
2934

3035
// GmmLib can apply 2Way WA to GMM_RESOURCE_USAGE_HW_CONTEXT.
3136
#define _WA_2W (WA(Wa_14018976079) || WA(Wa_14018984349)) ? 2 : 0
@@ -54,6 +59,16 @@ OTHER DEALINGS IN THE SOFTWARE.
5459
// IgPAT : Ignore PAT 1 = Override by MOCS, 0 = Defer to PAT
5560
//Macros for segment-preference
5661
#define NoP 0x0
62+
//Wa_14018443005
63+
#define COMPRESSED_PAT_WITH_L4WB_L3UC_0 PAT10
64+
#define COMPRESSED_PAT_WITH_L4WB_L3WB_0 PAT14
65+
#define COMPRESSED_PAT_WITH_L4UC_L3UC_0 PAT12
66+
#define COMPRESSED_PAT_WITH_L4UC_L3WB_0 PAT9
67+
68+
#define ISWA_1401844305USAGE(usage) ((Usage == GMM_RESOURCE_USAGE_BLT_SOURCE) || \
69+
(Usage == GMM_RESOURCE_USAGE_BLT_DESTINATION) || \
70+
(Usage == GMM_RESOURCE_USAGE_COPY_SOURCE) || \
71+
(Usage == GMM_RESOURCE_USAGE_COPY_DEST))
5772
//******************************************************************************************************************************************************************/
5873
// USAGE TYPE L3_CC, L3_CLOS, L1CC, L2CC, L4CC, Coherency, IgPAT, SegOv)
5974
/*******************************************************************************************************************************************************************/
@@ -115,10 +130,10 @@ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_INDEX_BUFFER_L3_CACHED
115130
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_MCS , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
116131
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_PUSH_CONSTANT_BUFFER , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
117132
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_PULL_CONSTANT_BUFFER , 1, 0, 5, 0 , 0 , 0 , 1, NoP);
118-
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_QUERY , 0, 0, 0, 0 , 0 , 1 , 1, NoP);
133+
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_QUERY , _WA_WB_Emu, 0, 0, 0 , 0 , 1 , 1, NoP);
119134
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_RENDER_TARGET , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
120135
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SHADER_RESOURCE , 1, 0, 5, 0 , 0 , 0 , 1, NoP);
121-
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_STAGING , 0, 0, 0, 0 , 0 , 1 , 1, NoP);
136+
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_STAGING , _WA_WB_Emu, 0, 0, 0 , 0 , 1 , 1, NoP);
122137
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_STENCIL_BUFFER , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
123138
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_STREAM_OUTPUT_BUFFER , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
124139
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_TILE_POOL , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
@@ -201,7 +216,7 @@ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_SCRATCH
201216
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_PRIVATE_MEM , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
202217
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_PRINTF_BUFFER , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
203218
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_STATE_HEAP_BUFFER , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
204-
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_SYSTEM_MEMORY_BUFFER , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
219+
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_SYSTEM_MEMORY_BUFFER , 1, 0, 0, 0 , 0 , 1 , 1, NoP);
205220
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_SYSTEM_MEMORY_BUFFER_CACHELINE_MISALIGNED , 0, 0, 0, 0 , 0 , 0 , 1, NoP);
206221
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_ISH_HEAP_BUFFER , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
207222
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_OCL_TAG_MEMORY_BUFFER , 1, 0, 0, 0 , 0 , 0 , 1, NoP);
@@ -215,9 +230,9 @@ DEFINE_CACHE_ELEMENT( GMM_RESOURCE_USAGE_XADAPTER_SHARED_RESOURCE
215230
/**********************************************************************************/
216231

217232
// BCS
218-
// USAGE TYPE L3_CC, L3_CLOS, L1CC, L2CC, L4CC, Coherency, IgPAT)
219-
DEFINE_CACHE_ELEMENT( GMM_RESOURCE_USAGE_BLT_SOURCE , _WA_WB, 0, 0, 0 , 0 , 0 , 1, NoP);
220-
DEFINE_CACHE_ELEMENT( GMM_RESOURCE_USAGE_BLT_DESTINATION , _WA_WB, 0, 0, 0 , 0 , 0 , 1, NoP);
233+
// USAGE TYPE L3_CC, L3_CLOS, L1CC, L2CC, L4CC, Coherency, IgPAT)
234+
DEFINE_CACHE_ELEMENT( GMM_RESOURCE_USAGE_BLT_SOURCE , 0, 0, 0, 0, 0, 0, 1, NoP);
235+
DEFINE_CACHE_ELEMENT( GMM_RESOURCE_USAGE_BLT_DESTINATION , 0, 0, 0, 0, 0, 0, 1, NoP);
221236

222237
/**********************************************************************************/
223238
//
@@ -270,8 +285,8 @@ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_COMMAND_STREAMER
270285

271286
// USAGE TYPE , L3_CC, L3_CLOS, L1CC, L2CC, L4CC, Coherency, IgPAT)
272287
// Uncacheable copies
273-
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_COPY_SOURCE , _WA_WB, 0, 0 , 0, 0, 0 , 1, NoP);
274-
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_COPY_DEST , _WA_WB, 0, 0 , 0, 0, 0 , 1, NoP);
288+
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_COPY_SOURCE , 0, 0, 0 , 0, 0, 0, 1, NoP);
289+
DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_COPY_DEST , 0, 0, 0 , 0, 0, 0, 1, NoP);
275290

276291
// clang-format on
277292

‎Source/GmmLib/GlobalInfo/GmmInfo.cpp

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ extern "C" GMM_STATUS GMM_STDCALL GmmCreateLibContext(const PLATFORM Platform,
128128
const void * pSkuTable,
129129
const void * pWaTable,
130130
const void * pGtSysInfo,
131-
ADAPTER_BDF sBdf)
131+
ADAPTER_BDF sBdf,
132+
const GMM_CLIENT ClientType)
132133
#endif
133134
{
134135
__GMM_ASSERTPTR(pSkuTable, GMM_ERROR);
@@ -144,7 +145,7 @@ extern "C" GMM_STATUS GMM_STDCALL GmmCreateLibContext(const PLATFORM Platform,
144145
#if LHDM
145146
return pGmmMALibContext->AddContext(Platform, pSkuTable, pWaTable, pGtSysInfo, sBdf, DeviceRegistryPath);
146147
#else
147-
return pGmmMALibContext->AddContext(Platform, pSkuTable, pWaTable, pGtSysInfo, sBdf);
148+
return pGmmMALibContext->AddContext(Platform, pSkuTable, pWaTable, pGtSysInfo, sBdf, ClientType);
148149
#endif
149150
}
150151

@@ -228,7 +229,8 @@ GMM_STATUS GMM_STDCALL GmmLib::GmmMultiAdapterContext::AddContext(const PLATFORM
228229
const void *_pSkuTable,
229230
const void *_pWaTable,
230231
const void *_pGtSysInfo,
231-
ADAPTER_BDF sBdf)
232+
ADAPTER_BDF sBdf,
233+
const GMM_CLIENT ClientType)
232234
#endif
233235
{
234236
__GMM_ASSERTPTR(_pSkuTable, GMM_ERROR);
@@ -284,7 +286,7 @@ GMM_STATUS GMM_STDCALL GmmLib::GmmMultiAdapterContext::AddContext(const PLATFORM
284286

285287
pGmmLibContext->IncrementRefCount();
286288

287-
Status = (pGmmLibContext->InitContext(Platform, pSkuTable, pWaTable, pSysInfo, GMM_KMD_VISTA));
289+
Status = (pGmmLibContext->InitContext(Platform, pSkuTable, pWaTable, pSysInfo, ClientType));
288290
if (Status != GMM_SUCCESS)
289291
{
290292
//clean everything and return error
@@ -1067,7 +1069,7 @@ void GMM_STDCALL GmmLib::Context::OverrideSkuWa()
10671069
SkuTable.Ftr57bGPUAddressing = true;
10681070
}
10691071

1070-
if (GFX_GET_CURRENT_PRODUCT(this->GetPlatformInfo().Platform) >= IGFX_LUNARLAKE)
1072+
if (GFX_GET_CURRENT_PRODUCT(this->GetPlatformInfo().Platform) >= IGFX_BMG)
10711073
{
10721074
// FtrL3TransientDataFlush is always enabled for XE2 adding GMM Override if UMDs might have reset this.
10731075
SkuTable.FtrL3TransientDataFlush = true;
@@ -1086,7 +1088,7 @@ GMM_CACHE_POLICY *GMM_STDCALL GmmLib::Context::CreateCachePolicyCommon()
10861088
return GetCachePolicyObj();
10871089
}
10881090

1089-
if(ProductFamily >= IGFX_LUNARLAKE)
1091+
if(ProductFamily >= IGFX_BMG)
10901092
{
10911093
pGmmCachePolicy = new GmmLib::GmmXe2_LPGCachePolicy(CachePolicy, this);
10921094
}
@@ -1098,6 +1100,9 @@ GMM_CACHE_POLICY *GMM_STDCALL GmmLib::Context::CreateCachePolicyCommon()
10981100
{
10991101
switch(GFX_GET_CURRENT_RENDERCORE(this->GetPlatformInfo().Platform))
11001102
{
1103+
case IGFX_XE2_HPG_CORE:
1104+
pGmmCachePolicy = new GmmLib::GmmXe2_LPGCachePolicy(CachePolicy, this);
1105+
break;
11011106
case IGFX_GEN12LP_CORE:
11021107
case IGFX_GEN12_CORE:
11031108
case IGFX_XE_HP_CORE:
@@ -1173,8 +1178,11 @@ GMM_TEXTURE_CALC *GMM_STDCALL GmmLib::Context::CreateTextureCalc(PLATFORM Platfo
11731178
case IGFX_XE_HP_CORE:
11741179
case IGFX_XE_HPG_CORE:
11751180
case IGFX_XE_HPC_CORE:
1181+
return new GmmGen12TextureCalc(this);
1182+
break;
1183+
case IGFX_XE2_HPG_CORE:
11761184
default:
1177-
return new GmmGen12TextureCalc(this);
1185+
return new GmmXe_LPGTextureCalc(this);
11781186
break;
11791187
}
11801188
}
@@ -1207,6 +1215,7 @@ GMM_PLATFORM_INFO_CLASS *GMM_STDCALL GmmLib::Context::CreatePlatformInfo(PLATFOR
12071215
case IGFX_XE_HP_CORE:
12081216
case IGFX_XE_HPG_CORE:
12091217
case IGFX_XE_HPC_CORE:
1218+
case IGFX_XE2_HPG_CORE:
12101219
return new GmmLib::PlatformInfoGen12(Platform, (GMM_LIB_CONTEXT *)this);
12111220
break;
12121221
case IGFX_GEN11_CORE:

‎Source/GmmLib/GlobalInfo/GmmLibDllMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ extern "C" GMM_LIB_API GMM_STATUS GMM_STDCALL InitializeGmm(GMM_INIT_IN_ARGS *pI
5555
#endif
5656

5757
Status = GmmCreateLibContext(pInArgs->Platform, pInArgs->pSkuTable, pInArgs->pWaTable,
58-
pInArgs->pGtSysInfo, stAdapterBDF);
58+
pInArgs->pGtSysInfo, stAdapterBDF, pInArgs->ClientType);
5959

6060
if(Status == GMM_SUCCESS)
6161
{

‎Source/GmmLib/Platform/GmmGen12Platform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ else
360360
Data.NoOfBitsSupported = 39;
361361
Data.HighestAcceptablePhysicalAddress = GFX_MASK_LARGE(0, 38);
362362

363-
if (GFX_GET_CURRENT_PRODUCT(Data.Platform) >= IGFX_LUNARLAKE)
363+
if (GFX_GET_CURRENT_PRODUCT(Data.Platform) >= IGFX_BMG)
364364
{
365365
Data.NoOfBitsSupported = 52;
366366
Data.HighestAcceptablePhysicalAddress = GFX_MASK_LARGE(0, 51);

‎Source/GmmLib/ULT/GmmXe2_LPGResourceULT.cpp

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ void CTestXe2_LPGResource::SetUp_Xe2Variant(PRODUCT_FAMILY platform)
4848
{
4949
printf("%s\n", __FUNCTION__);
5050

51-
if (platform == IGFX_LUNARLAKE)
51+
if (platform == IGFX_BMG)
52+
{
53+
GfxPlatform.eProductFamily = IGFX_BMG;
54+
GfxPlatform.eRenderCoreFamily = IGFX_XE2_HPG_CORE;
55+
}
56+
else if (platform == IGFX_LUNARLAKE)
5257
{
5358
GfxPlatform.eProductFamily = IGFX_LUNARLAKE;
5459
GfxPlatform.eRenderCoreFamily = IGFX_XE2_LPG_CORE;
@@ -69,7 +74,13 @@ void CTestXe2_LPGResource::SetUp_Xe2Variant(PRODUCT_FAMILY platform)
6974
pGfxAdapterInfo->SkuTable.FtrDiscrete = 0;
7075
pGfxAdapterInfo->SkuTable.FtrE2ECompression = 1;
7176

72-
if (platform == IGFX_LUNARLAKE )
77+
if (platform == IGFX_BMG)
78+
{
79+
pGfxAdapterInfo->SkuTable.FtrLocalMemory = 1;
80+
pGfxAdapterInfo->SkuTable.FtrDiscrete = 1;
81+
}
82+
83+
if (platform == IGFX_LUNARLAKE || platform == IGFX_BMG)
7384
{
7485
pGfxAdapterInfo->WaTable.Wa_14018976079 = 1;
7586
pGfxAdapterInfo->WaTable.Wa_14018984349 = 1;
@@ -86,6 +97,12 @@ void CTestXe2_LPGResource::TearDown_Xe2Variant()
8697
CommonULT::TearDownTestCase();
8798
}
8899

100+
TEST_F(CTestXe2_LPGResource, TestMSAA_BMG)
101+
{
102+
SetUp_Xe2Variant(IGFX_BMG);
103+
TestMSAA();
104+
TearDown_Xe2Variant();
105+
}
89106

90107
TEST_F(CTestXe2_LPGResource, TestMSAA_LNL)
91108
{

‎Source/GmmLib/ULT/GmmXe_LPGCachePolicyULT.cpp

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,16 @@ void CTestXe_LPGCachePolicy::SetUpXe_LPGVariant(PRODUCT_FAMILY platform)
4848

4949
GfxPlatform.eProductFamily = platform;
5050

51-
if (platform >= IGFX_LUNARLAKE)
51+
if (platform == IGFX_LUNARLAKE)
5252
{
5353
GfxPlatform.eRenderCoreFamily = IGFX_XE2_LPG_CORE;
5454
}
55+
else if (platform >= IGFX_BMG)
56+
{
57+
GfxPlatform.eRenderCoreFamily = IGFX_XE2_HPG_CORE;
58+
}
5559
else
5660
{
57-
5861
GfxPlatform.eRenderCoreFamily = IGFX_XE_HPG_CORE;
5962
}
6063

@@ -72,12 +75,19 @@ void CTestXe_LPGCachePolicy::SetUpXe_LPGVariant(PRODUCT_FAMILY platform)
7275
pGfxAdapterInfo->SkuTable.FtrL4Cache = 1;
7376
pGfxAdapterInfo->SkuTable.FtrL3TransientDataFlush = 0;
7477

75-
if (platform >= IGFX_LUNARLAKE)
78+
if (platform == IGFX_BMG)
79+
{
80+
pGfxAdapterInfo->SkuTable.FtrLocalMemory = 1;
81+
pGfxAdapterInfo->SkuTable.FtrDiscrete = 1;
82+
}
83+
84+
if (platform >= IGFX_BMG)
7685
{
7786
pGfxAdapterInfo->SkuTable.FtrL3TransientDataFlush = 1;
7887
pGfxAdapterInfo->WaTable.Wa_14018976079 = 1;
7988
pGfxAdapterInfo->WaTable.Wa_14018984349 = 1;
8089
}
90+
8191
CommonULT::SetUpTestCase();
8292
}
8393
}
@@ -98,13 +108,23 @@ TEST_F(CTestXe_LPGCachePolicy, TestXe_LPGCachePolicy_FtrL4CacheEnabled)
98108
TearDownXe_LPGVariant();
99109
}
100110

111+
/***********************Xe2_HPG***********************************/
112+
TEST_F(CTestXe_LPGCachePolicy, TestXe2_HPGCachePolicy_FtrL4CacheEnabled)
113+
{
114+
SetUpXe_LPGVariant(IGFX_BMG);
115+
CheckXe2_HPGVirtualL3CachePolicy();
116+
CheckPAT(); // Has both L3 and PAT within
117+
Check_Xe2_HPG_PATCompressed();
118+
119+
TearDownXe_LPGVariant();
120+
}
101121
TEST_F(CTestXe_LPGCachePolicy, TestXe2_LPGCachePolicy_FtrL4CacheEnabled)
102122
{
103123
SetUpXe_LPGVariant(IGFX_LUNARLAKE);
104124

105-
CheckXe2_LPGVirtualL3CachePolicy();
125+
CheckXe2_HPGVirtualL3CachePolicy();
106126
CheckPAT(); // Has both L3 and PAT within
107-
Check_Xe2_LPG_PATCompressed();
127+
Check_Xe2_HPG_PATCompressed();
108128

109129
TearDownXe_LPGVariant();
110130
}
@@ -190,7 +210,7 @@ void CTestXe_LPGCachePolicy::CheckPAT()
190210
}
191211
}
192212

193-
void CTestXe_LPGCachePolicy::Check_Xe2_LPG_PATCompressed()
213+
void CTestXe_LPGCachePolicy::Check_Xe2_HPG_PATCompressed()
194214
{
195215
bool CompressionEnReq = true;
196216

@@ -209,7 +229,7 @@ void CTestXe_LPGCachePolicy::Check_Xe2_LPG_PATCompressed()
209229
}
210230
}
211231

212-
void CTestXe_LPGCachePolicy::CheckXe2_LPGVirtualL3CachePolicy()
232+
void CTestXe_LPGCachePolicy::CheckXe2_HPGVirtualL3CachePolicy()
213233
{
214234
const uint32_t L4_WB_CACHEABLE = 0x0;
215235
const uint32_t L4_WT_CACHEABLE = 0x1;

‎Source/GmmLib/ULT/GmmXe_LPGCachePolicyULT.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class CTestXe_LPGCachePolicy : public CTestCachePolicy
3030
virtual void TearDownXe_LPGVariant();
3131
virtual void CheckVirtualL3CachePolicy();
3232
virtual void CheckPAT();
33-
virtual void Check_Xe2_LPG_PATCompressed();
34-
virtual void CheckXe2_LPGVirtualL3CachePolicy();
33+
virtual void Check_Xe2_HPG_PATCompressed();
34+
virtual void CheckXe2_HPGVirtualL3CachePolicy();
3535

3636
public:
3737
static void SetUpTestCase();

‎Source/GmmLib/inc/External/Common/GmmClientContext.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ extern "C" {
212212
const void * pSkuTable,
213213
const void * pWaTable,
214214
const void * pGtSysInfo,
215-
ADAPTER_BDF sBdf);
215+
ADAPTER_BDF sBdf,
216+
const GMM_CLIENT ClientType);
216217
#endif
217218

218219
void GMM_STDCALL GmmLibContextFree(ADAPTER_BDF sBdf);

‎Source/GmmLib/inc/External/Common/GmmInfo.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,8 @@ typedef struct _GMM_ADAPTER_INFO_
657657
const void * pSkuTable,
658658
const void * pWaTable,
659659
const void * pGtSysInfo,
660-
ADAPTER_BDF sBdf);
660+
ADAPTER_BDF sBdf,
661+
const GMM_CLIENT ClientType);
661662
#endif
662663
GMM_STATUS GMM_STDCALL RemoveContext(ADAPTER_BDF sBdf);
663664
Context* GMM_STDCALL GetAdapterLibContext(ADAPTER_BDF sBdf);

0 commit comments

Comments
 (0)