Skip to content

Commit b136069

Browse files
johnbashgfxbot
johnbash
authored and
gfxbot
committed
Add TGL_LP support
Change-Id: I522eeb8ea285eb900890ecf454ee12ed30f867f2
1 parent 19ab520 commit b136069

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+7101
-724
lines changed

‎Source/GmmLib/CMakeLists.txt‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ cmake_minimum_required(VERSION 3.5)
2424
project(igfx_gmmumd)
2525

2626
# GmmLib Api Version used for so naming
27-
set(GMMLIB_API_MAJOR_VERSION 9)
27+
set(GMMLIB_API_MAJOR_VERSION 10)
2828
set(GMMLIB_API_MINOR_VERSION 0)
2929

3030
if(NOT DEFINED MAJOR_VERSION)
31-
set(MAJOR_VERSION 9)
31+
set(MAJOR_VERSION 10)
3232
endif()
3333

3434
if(NOT DEFINED MINOR_VERSION)
@@ -176,10 +176,12 @@ set(HEADERS_
176176
${BS_DIR_GMMLIB}/CachePolicy/GmmCachePolicyUndefineConditionals.h
177177
${BS_DIR_GMMLIB}/CachePolicy/GmmGen10CachePolicy.h
178178
${BS_DIR_GMMLIB}/CachePolicy/GmmGen11CachePolicy.h
179+
${BS_DIR_GMMLIB}/CachePolicy/GmmGen12CachePolicy.h
179180
${BS_DIR_GMMLIB}/CachePolicy/GmmGen8CachePolicy.h
180181
${BS_DIR_GMMLIB}/CachePolicy/GmmGen9CachePolicy.h
181182
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen10.h
182183
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen11.h
184+
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen12.h
183185
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen8.h
184186
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen9.h
185187
${BS_DIR_GMMLIB}/inc/External/Common/GmmCachePolicy.h
@@ -205,10 +207,12 @@ set(HEADERS_
205207
${BS_DIR_GMMLIB}/inc/External/Linux/GmmResourceInfoLin.h
206208
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen10Platform.h
207209
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen11Platform.h
210+
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen12Platform.h
208211
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen8Platform.h
209212
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen9Platform.h
210213
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen10TextureCalc.h
211214
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen11TextureCalc.h
215+
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen12TextureCalc.h
212216
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen7TextureCalc.h
213217
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen8TextureCalc.h
214218
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen9TextureCalc.h
@@ -235,7 +239,9 @@ set(SOURCES_
235239
${BS_DIR_GMMLIB}/CachePolicy/GmmGen9CachePolicy.cpp
236240
${BS_DIR_GMMLIB}/CachePolicy/GmmGen10CachePolicy.cpp
237241
${BS_DIR_GMMLIB}/CachePolicy/GmmGen11CachePolicy.cpp
242+
${BS_DIR_GMMLIB}/CachePolicy/GmmGen12CachePolicy.cpp
238243
${BS_DIR_GMMLIB}/Platform/GmmGen11Platform.cpp
244+
${BS_DIR_GMMLIB}/Platform/GmmGen12Platform.cpp
239245
${BS_DIR_GMMLIB}/Platform/GmmGen8Platform.cpp
240246
${BS_DIR_GMMLIB}/Platform/GmmGen9Platform.cpp
241247
${BS_DIR_GMMLIB}/Platform/GmmGen10Platform.cpp
@@ -249,6 +255,7 @@ set(SOURCES_
249255
${BS_DIR_GMMLIB}/Texture/GmmGen9Texture.cpp
250256
${BS_DIR_GMMLIB}/Texture/GmmGen10Texture.cpp
251257
${BS_DIR_GMMLIB}/Texture/GmmGen11Texture.cpp
258+
${BS_DIR_GMMLIB}/Texture/GmmGen12Texture.cpp
252259
${BS_DIR_GMMLIB}/Texture/GmmTexture.cpp
253260
${BS_DIR_GMMLIB}/Texture/GmmTextureAlloc.cpp
254261
${BS_DIR_GMMLIB}/Texture/GmmTextureSpecialCases.cpp
@@ -271,6 +278,7 @@ source_group("Source Files\\Cache Policy\\Client Files" FILES
271278
${BS_DIR_GMMLIB}/CachePolicy/GmmCachePolicyResourceUsageDefinitions.h
272279
${BS_DIR_GMMLIB}/CachePolicy/GmmGen10CachePolicy.h
273280
${BS_DIR_GMMLIB}/CachePolicy/GmmGen11CachePolicy.h
281+
${BS_DIR_GMMLIB}/CachePolicy/GmmGen12CachePolicy.h
274282
${BS_DIR_GMMLIB}/CachePolicy/GmmGen8CachePolicy.h
275283
${BS_DIR_GMMLIB}/CachePolicy/GmmGen9CachePolicy.h
276284
)
@@ -316,6 +324,7 @@ source_group("Header Files" FILES
316324
source_group("Header Files\\External\\Common\\Cache Policy" FILES
317325
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen10.h
318326
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen11.h
327+
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen12.h
319328
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen8.h
320329
${BS_DIR_GMMLIB}/inc/External/Common/CachePolicy/GmmCachePolicyGen9.h
321330
)
@@ -332,13 +341,15 @@ source_group("Header Files\\Internal\\Common" FILES
332341
source_group("Header Files\\Internal\\Common\\Platform" FILES
333342
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen10Platform.h
334343
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen11Platform.h
344+
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen12Platform.h
335345
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen8Platform.h
336346
${BS_DIR_GMMLIB}/inc/Internal/Common/Platform/GmmGen9Platform.h
337347
)
338348

339349
source_group("Header Files\\Internal\\Common\\Texture" FILES
340350
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen10TextureCalc.h
341351
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen11TextureCalc.h
352+
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen12TextureCalc.h
342353
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen7TextureCalc.h
343354
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen8TextureCalc.h
344355
${BS_DIR_GMMLIB}/inc/Internal/Common/Texture/GmmGen9TextureCalc.h

‎Source/GmmLib/CachePolicy/GmmCachePolicyResourceUsageDefinitions.h‎

100755100644
Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_TIMER_PERF_QUEUE )
4949
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_UNMAP_PAGING_RESERVED_GTT_DMA_BUFFER )
5050
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_VSC_BATCH_BUFFER )
5151
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_WA_BATCH_BUFFER )
52+
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_KMD_OCA_BUFFER)
53+
5254
//
5355
// 3D Usages
5456
//
@@ -99,20 +101,24 @@ DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_TILED_SHADER_RESOURCE )
99101
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_TILED_UAV )
100102

101103
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_VERTEX_BUFFER )
102-
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_VERTEX_BUFFER_L3_COHERENT_UC )
103-
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_VERTEX_BUFFER_L3_CACHED )
104+
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_VERTEX_BUFFER_L3_COHERENT_UC)
105+
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_VERTEX_BUFFER_L3_CACHED)
104106
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_OGL_WSTN_VERTEX_BUFFER )
107+
DEFINE_RESOURCE_USAGE(GMM_RESOURCE_USAGE_POSH_VERTEX_BUFFER)
105108
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_UAV )
106109
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_RENDER_TARGET_AND_SHADER_RESOURCE )
107110
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_RENDER_TARGET_AND_SHADER_RESOURCE_PARTIALENCSURFACES )
108111
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_WDDM_HISTORY_BUFFER )
109112
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_CONTEXT_SAVE_RESTORE )
113+
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_PTBR_PAGE_POOL )
114+
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_PTBR_BATCH_BUFFER )
115+
110116

111117
//
112118
// CM USAGES
113119
//
114120
DEFINE_RESOURCE_USAGE( CM_RESOURCE_USAGE_SurfaceState )
115-
DEFINE_RESOURCE_USAGE( CM_RESOURCE_USAGE_StateHeap )
121+
DEFINE_RESOURCE_USAGE( CM_RESOURCE_USAGE_StateHeap)
116122
DEFINE_RESOURCE_USAGE( CM_RESOURCE_USAGE_NO_L3_SurfaceState )
117123
DEFINE_RESOURCE_USAGE( CM_RESOURCE_USAGE_NO_LLC_ELLC_SurfaceState )
118124
DEFINE_RESOURCE_USAGE( CM_RESOURCE_USAGE_NO_LLC_SurfaceState )
@@ -175,7 +181,7 @@ DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_CURR_ENCODE )
175181
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_REF_ENCODE )
176182
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_MV_DATA_ENCODE )
177183
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_HME_DOWNSAMPLED_ENCODE )
178-
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_HME_DOWNSAMPLED_ENCODE_FF )
184+
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_HME_DOWNSAMPLED_ENCODE_FF)
179185
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_HME_DOWNSAMPLED_ENCODE_DST )
180186
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_ME_DISTORTION_ENCODE )
181187
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_SURFACE_BRC_ME_DISTORTION_ENCODE )
@@ -283,3 +289,7 @@ DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_OCL_IMAGE_NO_LLC_CACHING )
283289

284290
// Cross Adapter
285291
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_XADAPTER_SHARED_RESOURCE )
292+
293+
// BCS usages
294+
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_BLT_SOURCE )
295+
DEFINE_RESOURCE_USAGE( GMM_RESOURCE_USAGE_BLT_DESTINATION )

‎Source/GmmLib/CachePolicy/GmmGen10CachePolicy.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,7 @@ GMM_STATUS GmmLib::GmmGen10CachePolicy::SetPATInitWA()
254254
GMM_STATUS Status = GMM_SUCCESS;
255255

256256
#if(defined(__GMM_KMD__))
257-
if(pGmmGlobalContext->GetGtSysInfoPtr()->EdramSizeInKb)
258-
{
259-
const_cast<WA_TABLE &>(pGmmGlobalContext->GetWaTable()).WaNoMocsEllcOnly = 1;
260-
}
257+
261258
#else
262259
Status = GMM_ERROR;
263260
#endif
@@ -363,7 +360,7 @@ GMM_STATUS GmmLib::GmmGen10CachePolicy::SetupPAT()
363360
{
364361
GMM_PRIVATE_PAT PAT = {0};
365362

366-
if(pGmmGlobalContext->GetWaTable().WaNoMocsEllcOnly)
363+
if(pGmmGlobalContext->GetWaTable().FtrMemTypeMocsDeferPAT)
367364
{
368365
GfxTargetCache = GMM_GFX_TC_ELLC_ONLY;
369366
}

0 commit comments

Comments
 (0)