Skip to content

Commit 8122219

Browse files
johnmachjohnmach
authored
Add DG2 device IDs (#72)
1 parent 31476d3 commit 8122219

File tree

2 files changed

+46
-8
lines changed

2 files changed

+46
-8
lines changed

‎Source/GmmLib/Utility/GmmLibObject.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ GmmLib::PlatformInfo *GmmLib::PlatformInfo::Create(PLATFORM Platform, bool Overr
6969
case IGFX_GEN12LP_CORE:
7070
case IGFX_GEN12_CORE:
7171
case IGFX_XE_HP_CORE:
72+
case IGFX_XE_HPG_CORE:
7273
return new GmmLib::PlatformInfoGen12(Platform);
7374
break;
7475
case IGFX_GEN11_CORE:
@@ -109,7 +110,8 @@ GmmLib::GmmCachePolicyCommon *GmmLib::GmmCachePolicyCommon::Create()
109110
case IGFX_GEN12LP_CORE:
110111
case IGFX_GEN12_CORE:
111112
case IGFX_XE_HP_CORE:
112-
if(pGmmGlobalContext->GetSkuTable().FtrLocalMemory)
113+
case IGFX_XE_HPG_CORE:
114+
if(pGmmGlobalContext->GetSkuTable().FtrLocalMemory)
113115
{
114116
pGmmCachePolicy = new GmmLib::GmmGen12dGPUCachePolicy(CachePolicy);
115117
}
@@ -180,6 +182,7 @@ GmmLib::GmmTextureCalc *GmmLib::GmmTextureCalc::Create(PLATFORM Platform, uint8_
180182
case IGFX_GEN12LP_CORE:
181183
case IGFX_GEN12_CORE:
182184
case IGFX_XE_HP_CORE:
185+
case IGFX_XE_HPG_CORE:
183186
default:
184187
return new GmmGen12TextureCalc();
185188
break;

‎Source/inc/common/igfxfmid.h

+42-7
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ typedef enum {
7373

7474
IGFX_DG1 = 1210,
7575
IGFX_XE_HP_SDV = 1250,
76+
IGFX_DG2 = 1270,
7677
IGFX_PVC = 1271,
7778

7879
IGFX_MAX_PRODUCT,
@@ -127,8 +128,8 @@ typedef enum {
127128
IGFX_GEN11LP_CORE = 16, //Gen11 LP Family
128129
IGFX_GEN12_CORE = 17, //Gen12 Family
129130
IGFX_GEN12LP_CORE = 18, //Gen12 LP Family
130-
IGFX_XE_HP_CORE =0x0c05, //XE_HP family
131-
131+
IGFX_XE_HP_CORE = 0x0c05, //XE_HP family
132+
IGFX_XE_HPG_CORE = 0x0c07, // XE_HPG Family
132133
//Please add new GENs BEFORE THIS !
133134
IGFX_MAX_CORE,
134135

@@ -285,7 +286,8 @@ typedef enum __NATIVEGTTYPE
285286

286287
// This macro returns true if the product family is discrete
287288
#define GFX_IS_DISCRETE_FAMILY(p) ( ( GFX_GET_CURRENT_PRODUCT(p) == IGFX_DG1 ) || \
288-
( GFX_GET_CURRENT_PRODUCT(p) == IGFX_XE_HP_SDV ))
289+
( GFX_GET_CURRENT_PRODUCT(p) == IGFX_XE_HP_SDV ) || \
290+
( GFX_GET_CURRENT_PRODUCT(p) == IGFX_DG2 ) )
289291

290292
// These macros return true/false depending on the current render family.
291293
#define GFX_IS_NAPA_RENDER_FAMILY(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN3_CORE ) || \
@@ -304,6 +306,7 @@ typedef enum __NATIVEGTTYPE
304306
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
305307
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
306308
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
309+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
307310
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
308311

309312
#define GFX_IS_GEN_5_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN5_CORE ) || \
@@ -317,6 +320,7 @@ typedef enum __NATIVEGTTYPE
317320
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
318321
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
319322
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
323+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
320324
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
321325

322326
#define GFX_IS_GEN_5_75_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN5_75_CORE ) || \
@@ -328,6 +332,7 @@ typedef enum __NATIVEGTTYPE
328332
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
329333
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
330334
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
335+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
331336
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
332337

333338
#define GFX_IS_GEN_6_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN6_CORE ) || \
@@ -337,6 +342,7 @@ typedef enum __NATIVEGTTYPE
337342
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN9_CORE ) || \
338343
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
339344
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
345+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
340346
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
341347

342348
#define GFX_IS_GEN_7_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN7_CORE ) || \
@@ -346,6 +352,7 @@ typedef enum __NATIVEGTTYPE
346352
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
347353
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
348354
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
355+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
349356
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
350357

351358
#define GFX_IS_GEN_7_5_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN7_5_CORE ) || \
@@ -354,35 +361,41 @@ typedef enum __NATIVEGTTYPE
354361
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
355362
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
356363
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
364+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
357365
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
358366

359367
#define GFX_IS_GEN_8_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN8_CORE ) || \
360368
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN9_CORE ) || \
361369
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
362370
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
363371
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
372+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
364373
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
365374

366375
#define GFX_IS_GEN_8_CHV_OR_LATER(p) ( ( GFX_GET_CURRENT_PRODUCT(p) == IGFX_CHERRYVIEW ) || \
367376
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN9_CORE ) || \
368377
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
369378
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
370379
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
380+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
371381
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
372382

373383
#define GFX_IS_GEN_9_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN9_CORE ) || \
374384
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
375385
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
376386
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
387+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
377388
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
378389

379-
#define GFX_IS_GEN_10_OR_LATER(p) (( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
380-
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
381-
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
390+
#define GFX_IS_GEN_10_OR_LATER(p) (( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \
391+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
392+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
393+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
382394
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
383395

384-
#define GFX_IS_GEN_11_OR_LATER(p) (( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
396+
#define GFX_IS_GEN_11_OR_LATER(p) (( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \
385397
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \
398+
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \
386399
( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) )
387400
#define GFX_IS_GEN_12_OR_LATER(p) (( GFX_GET_CURRENT_RENDERCORE(p) >= IGFX_GEN12_CORE ))
388401
#define GFX_IS_ATOM_PRODUCT_FAMILY(p) ( GFX_IS_PRODUCT(p, IGFX_VALLEYVIEW) || \
@@ -1611,6 +1624,28 @@ typedef enum __NATIVEGTTYPE
16111624
// Macro to identify PVC device ID
16121625
#define GFX_IS_XT_CONFIG(d) (d == DEV_ID_0BD5)
16131626

1627+
//DG2 Device IDs
1628+
#define DEV_ID_4F80 0x4F80
1629+
#define DEV_ID_4F81 0x4F81
1630+
#define DEV_ID_4F82 0x4F82
1631+
#define DEV_ID_4F83 0x4F83
1632+
#define DEV_ID_4F84 0x4F84
1633+
#define DEV_ID_4F87 0x4F87
1634+
#define DEV_ID_4F88 0x4F88
1635+
#define DEV_ID_5690 0x5690
1636+
#define DEV_ID_5691 0x5691
1637+
#define DEV_ID_5692 0x5692
1638+
#define DEV_ID_5693 0x5693
1639+
#define DEV_ID_5694 0x5694
1640+
#define DEV_ID_5695 0x5695
1641+
#define DEV_ID_56A0 0x56A0
1642+
#define DEV_ID_56A1 0x56A1
1643+
#define DEV_ID_56A2 0x56A2
1644+
#define DEV_ID_56A5 0x56A5
1645+
#define DEV_ID_56A6 0x56A6
1646+
#define DEV_ID_56B0 0x56B0
1647+
#define DEV_ID_56B1 0x56B1
1648+
16141649
#define MGM_HAS 0
16151650

16161651
//#define SDG_HAS 1 //Reserve place for Springdale-G HAS

0 commit comments

Comments
 (0)