Remove not used GT type info

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski
2022-01-26 16:25:28 +00:00
committed by Compute-Runtime-Automation
parent a5067d6b0b
commit 72edadb265
50 changed files with 505 additions and 935 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Intel Corporation
* Copyright (C) 2021-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -7,53 +7,53 @@
#if SUPPORT_XE_HPC_CORE
#ifdef SUPPORT_PVC
DEVICE(0x0BD0, PVC_CONFIG, GTTYPE_GT4)
DEVICE(0x0BD5, PVC_CONFIG, GTTYPE_GT4)
DEVICE(0x0BD0, PVC_CONFIG)
DEVICE(0x0BD5, PVC_CONFIG)
#endif
#endif
#ifdef SUPPORT_XE_HPG_CORE
#ifdef SUPPORT_DG2
DEVICE(0x4F80, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x4F81, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x4F82, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x4F83, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x4F84, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x4F87, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x4F88, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x5690, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x5691, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x5692, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x5693, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x5694, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x5695, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x56A0, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x56A1, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x56A2, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x56A5, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x56A6, DG2_CONFIG, GTTYPE_GT4)
DEVICE(0x4F80, DG2_CONFIG)
DEVICE(0x4F81, DG2_CONFIG)
DEVICE(0x4F82, DG2_CONFIG)
DEVICE(0x4F83, DG2_CONFIG)
DEVICE(0x4F84, DG2_CONFIG)
DEVICE(0x4F87, DG2_CONFIG)
DEVICE(0x4F88, DG2_CONFIG)
DEVICE(0x5690, DG2_CONFIG)
DEVICE(0x5691, DG2_CONFIG)
DEVICE(0x5692, DG2_CONFIG)
DEVICE(0x5693, DG2_CONFIG)
DEVICE(0x5694, DG2_CONFIG)
DEVICE(0x5695, DG2_CONFIG)
DEVICE(0x56A0, DG2_CONFIG)
DEVICE(0x56A1, DG2_CONFIG)
DEVICE(0x56A2, DG2_CONFIG)
DEVICE(0x56A5, DG2_CONFIG)
DEVICE(0x56A6, DG2_CONFIG)
#endif
#endif
#ifdef SUPPORT_GEN12LP
#ifdef SUPPORT_ADLP
DEVICE(0x46A0, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46B0, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46A1, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46A2, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46A3, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46A6, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46A8, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46AA, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x462A, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x4626, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x4628, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46B1, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46B2, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46B3, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46C0, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46C1, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46C2, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46C3, ADLP_CONFIG, GTTYPE_GT2)
DEVICE(0x46A0, ADLP_CONFIG)
DEVICE(0x46B0, ADLP_CONFIG)
DEVICE(0x46A1, ADLP_CONFIG)
DEVICE(0x46A2, ADLP_CONFIG)
DEVICE(0x46A3, ADLP_CONFIG)
DEVICE(0x46A6, ADLP_CONFIG)
DEVICE(0x46A8, ADLP_CONFIG)
DEVICE(0x46AA, ADLP_CONFIG)
DEVICE(0x462A, ADLP_CONFIG)
DEVICE(0x4626, ADLP_CONFIG)
DEVICE(0x4628, ADLP_CONFIG)
DEVICE(0x46B1, ADLP_CONFIG)
DEVICE(0x46B2, ADLP_CONFIG)
DEVICE(0x46B3, ADLP_CONFIG)
DEVICE(0x46C0, ADLP_CONFIG)
DEVICE(0x46C1, ADLP_CONFIG)
DEVICE(0x46C2, ADLP_CONFIG)
DEVICE(0x46C3, ADLP_CONFIG)
#endif
#endif

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -8,237 +8,219 @@
// clang-format off
#ifdef SUPPORT_XE_HP_CORE
#ifdef SUPPORT_XE_HP_SDV
DEVICE(0x0201, XE_HP_SDV_CONFIG, GTTYPE_GT4)
DEVICE(0x0201, XE_HP_SDV_CONFIG)
#endif
#endif
#ifdef SUPPORT_GEN12LP
#ifdef SUPPORT_TGLLP
DEVICE( 0xFF20, TGLLP_1x6x16, GTTYPE_GT2 )
NAMEDDEVICE( 0x9A49, TGLLP_1x6x16, GTTYPE_GT2, "Intel(R) Iris(R) Xe Graphics" )
NAMEDDEVICE( 0x9A40, TGLLP_1x6x16, GTTYPE_GT2, "Intel(R) Iris(R) Xe Graphics" )
DEVICE( 0x9A59, TGLLP_1x6x16, GTTYPE_GT2 )
NAMEDDEVICE( 0x9A60, TGLLP_1x2x16, GTTYPE_GT2, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9A68, TGLLP_1x2x16, GTTYPE_GT2, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9A70, TGLLP_1x2x16, GTTYPE_GT2, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9A78, TGLLP_1x2x16, GTTYPE_GT2, "Intel(R) UHD Graphics" )
DEVICE( 0xFF20, TGLLP_1x6x16 )
NAMEDDEVICE( 0x9A49, TGLLP_1x6x16, "Intel(R) Iris(R) Xe Graphics" )
NAMEDDEVICE( 0x9A40, TGLLP_1x6x16, "Intel(R) Iris(R) Xe Graphics" )
DEVICE( 0x9A59, TGLLP_1x6x16 )
NAMEDDEVICE( 0x9A60, TGLLP_1x2x16, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9A68, TGLLP_1x2x16, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9A70, TGLLP_1x2x16, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9A78, TGLLP_1x2x16, "Intel(R) UHD Graphics" )
#endif
#ifdef SUPPORT_DG1
NAMEDDEVICE( 0x4905, DG1_CONFIG, GTTYPE_GT2, "Intel(R) Iris(R) Xe MAX Graphics" )
DEVICE( 0x4906, DG1_CONFIG, GTTYPE_GT2 )
NAMEDDEVICE( 0x4907, DG1_CONFIG, GTTYPE_GT2, "Intel(R) Server GPU SG-18M" )
NAMEDDEVICE( 0x4908, DG1_CONFIG, GTTYPE_GT2, "Intel(R) Iris(R) Xe Graphics" )
NAMEDDEVICE( 0x4905, DG1_CONFIG, "Intel(R) Iris(R) Xe MAX Graphics" )
DEVICE( 0x4906, DG1_CONFIG )
NAMEDDEVICE( 0x4907, DG1_CONFIG, "Intel(R) Server GPU SG-18M" )
NAMEDDEVICE( 0x4908, DG1_CONFIG, "Intel(R) Iris(R) Xe Graphics" )
#endif
#ifdef SUPPORT_RKL
DEVICE( 0x4C80, RKL_HW_CONFIG, GTTYPE_GT1 )
NAMEDDEVICE( 0x4C8A, RKL_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics 750" )
NAMEDDEVICE( 0x4C8B, RKL_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics 730" )
DEVICE( 0x4C8C, RKL_HW_CONFIG, GTTYPE_GT0_5 )
NAMEDDEVICE( 0x4C90, RKL_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics P750" )
DEVICE( 0x4C9A, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4C80, RKL_HW_CONFIG )
NAMEDDEVICE( 0x4C8A, RKL_HW_CONFIG, "Intel(R) UHD Graphics 750" )
NAMEDDEVICE( 0x4C8B, RKL_HW_CONFIG, "Intel(R) UHD Graphics 730" )
DEVICE( 0x4C8C, RKL_HW_CONFIG )
NAMEDDEVICE( 0x4C90, RKL_HW_CONFIG, "Intel(R) UHD Graphics P750" )
DEVICE( 0x4C9A, RKL_HW_CONFIG )
#endif
#ifdef SUPPORT_ADLS
NAMEDDEVICE( 0x4680, ADLS_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics 770" )
DEVICE( 0x4682, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4688, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x468A, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4690, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4692, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4693, ADLS_HW_CONFIG, GTTYPE_GT1 )
NAMEDDEVICE( 0x4680, ADLS_HW_CONFIG, "Intel(R) UHD Graphics 770" )
DEVICE( 0x4682, ADLS_HW_CONFIG )
DEVICE( 0x4688, ADLS_HW_CONFIG )
DEVICE( 0x468A, ADLS_HW_CONFIG )
DEVICE( 0x4690, ADLS_HW_CONFIG )
DEVICE( 0x4692, ADLS_HW_CONFIG )
DEVICE( 0x4693, ADLS_HW_CONFIG )
#endif
#endif
#ifdef SUPPORT_GEN11
#ifdef SUPPORT_ICLLP
// GT1
DEVICE( 0xFF05, ICLLP_1x4x8, GTTYPE_GT1 )
NAMEDDEVICE( 0x8A56, ICLLP_1x4x8, GTTYPE_GT1, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x8A58, ICLLP_1x4x8, GTTYPE_GT1, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x8A5C, ICLLP_1x6x8, GTTYPE_GT1, "Intel(R) Iris(R) Plus Graphics" )
NAMEDDEVICE( 0x8A5A, ICLLP_1x6x8, GTTYPE_GT1, "Intel(R) Iris(R) Plus Graphics" )
// GT2
DEVICE( 0x8A50, ICLLP_1x8x8, GTTYPE_GT2 )
NAMEDDEVICE( 0x8A52, ICLLP_1x8x8, GTTYPE_GT2, "Intel(R) Iris(R) Plus Graphics" )
NAMEDDEVICE( 0x8A51, ICLLP_1x8x8, GTTYPE_GT2, "Intel(R) Iris(R) Plus Graphics" )
#ifdef SUPPORT_ICLLP
DEVICE( 0xFF05, ICLLP_1x4x8 )
NAMEDDEVICE( 0x8A56, ICLLP_1x4x8, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x8A58, ICLLP_1x4x8, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x8A5C, ICLLP_1x6x8, "Intel(R) Iris(R) Plus Graphics" )
NAMEDDEVICE( 0x8A5A, ICLLP_1x6x8, "Intel(R) Iris(R) Plus Graphics" )
DEVICE( 0x8A50, ICLLP_1x8x8 )
NAMEDDEVICE( 0x8A52, ICLLP_1x8x8, "Intel(R) Iris(R) Plus Graphics" )
NAMEDDEVICE( 0x8A51, ICLLP_1x8x8, "Intel(R) Iris(R) Plus Graphics" )
#endif
#ifdef SUPPORT_LKF
NAMEDDEVICE( 0x9840, LKF_1x8x8, GTTYPE_GT1, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9840, LKF_1x8x8, "Intel(R) UHD Graphics" )
#endif
#ifdef SUPPORT_EHL
DEVICE( 0x4500, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4541, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4551, EHL_HW_CONFIG, GTTYPE_GT1 )
NAMEDDEVICE( 0x4571, EHL_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x4555, EHL_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics" )
DEVICE( 0x4E51, EHL_HW_CONFIG, GTTYPE_GT1 )
NAMEDDEVICE( 0x4E61, EHL_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x4E71, EHL_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x4E55, EHL_HW_CONFIG, GTTYPE_GT1, "Intel(R) UHD Graphics" )
DEVICE( 0x4500, EHL_HW_CONFIG )
DEVICE( 0x4541, EHL_HW_CONFIG )
DEVICE( 0x4551, EHL_HW_CONFIG )
NAMEDDEVICE( 0x4571, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x4555, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
DEVICE( 0x4E51, EHL_HW_CONFIG )
NAMEDDEVICE( 0x4E61, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x4E71, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x4E55, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
#endif
#endif
#ifdef SUPPORT_GEN9
#ifdef SUPPORT_SKL
// GT1
NAMEDDEVICE( 0x1902, SKL_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics 510" )
NAMEDDEVICE( 0x190B, SKL_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics 510" )
DEVICE( 0x190A, SKL_1x2x6, GTTYPE_GT1 )
NAMEDDEVICE( 0x1906, SKL_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics 510" )
DEVICE( 0x190E, SKL_1x2x6, GTTYPE_GT1 )
// GT1_5
DEVICE( 0x1917, SKL_1x3x6, GTTYPE_GT1_5 )
DEVICE( 0x1913, SKL_1x3x6, GTTYPE_GT1_5 )
DEVICE( 0X1915, SKL_1x3x6, GTTYPE_GT1_5 )
// GT2
NAMEDDEVICE( 0x1912, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 530" )
NAMEDDEVICE( 0x191B, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 530" )
DEVICE( 0x191A, SKL_1x3x8, GTTYPE_GT2 )
NAMEDDEVICE( 0x1916, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 520" )
NAMEDDEVICE( 0x191E, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 515" )
NAMEDDEVICE( 0x191D, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics P530" )
NAMEDDEVICE( 0x1921, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 520" )
DEVICE( 0x9905, SKL_1x3x8, GTTYPE_GT2 )
// GT3
NAMEDDEVICE( 0x192B, SKL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Graphics 555" )
NAMEDDEVICE( 0x192D, SKL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Graphics P555" )
DEVICE( 0x192A, SKL_2x3x8, GTTYPE_GT3 )
NAMEDDEVICE( 0x1923, SKL_2x3x8, GTTYPE_GT3, "Intel(R) HD Graphics 535" )
NAMEDDEVICE( 0x1926, SKL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Graphics 540" )
NAMEDDEVICE( 0x1927, SKL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Graphics 550" )
// GT4
DEVICE( 0x1932, SKL_3x3x8, GTTYPE_GT4 )
NAMEDDEVICE( 0x193B, SKL_3x3x8, GTTYPE_GT4, "Intel(R) Iris(R) Pro Graphics 580" )
NAMEDDEVICE( 0x193A, SKL_3x3x8, GTTYPE_GT4, "Intel(R) Iris(R) Pro Graphics P580" )
NAMEDDEVICE( 0x193D, SKL_3x3x8, GTTYPE_GT4, "Intel(R) Iris(R) Pro Graphics P580" )
NAMEDDEVICE( 0x1902, SKL_1x2x6, "Intel(R) HD Graphics 510" )
NAMEDDEVICE( 0x190B, SKL_1x2x6, "Intel(R) HD Graphics 510" )
DEVICE( 0x190A, SKL_1x2x6 )
NAMEDDEVICE( 0x1906, SKL_1x2x6, "Intel(R) HD Graphics 510" )
DEVICE( 0x190E, SKL_1x2x6 )
DEVICE( 0x1917, SKL_1x3x6 )
DEVICE( 0x1913, SKL_1x3x6 )
DEVICE( 0X1915, SKL_1x3x6 )
NAMEDDEVICE( 0x1912, SKL_1x3x8, "Intel(R) HD Graphics 530" )
NAMEDDEVICE( 0x191B, SKL_1x3x8, "Intel(R) HD Graphics 530" )
DEVICE( 0x191A, SKL_1x3x8 )
NAMEDDEVICE( 0x1916, SKL_1x3x8, "Intel(R) HD Graphics 520" )
NAMEDDEVICE( 0x191E, SKL_1x3x8, "Intel(R) HD Graphics 515" )
NAMEDDEVICE( 0x191D, SKL_1x3x8, "Intel(R) HD Graphics P530" )
NAMEDDEVICE( 0x1921, SKL_1x3x8, "Intel(R) HD Graphics 520" )
DEVICE( 0x9905, SKL_1x3x8 )
NAMEDDEVICE( 0x192B, SKL_2x3x8, "Intel(R) Iris(R) Graphics 555" )
NAMEDDEVICE( 0x192D, SKL_2x3x8, "Intel(R) Iris(R) Graphics P555" )
DEVICE( 0x192A, SKL_2x3x8 )
NAMEDDEVICE( 0x1923, SKL_2x3x8, "Intel(R) HD Graphics 535" )
NAMEDDEVICE( 0x1926, SKL_2x3x8, "Intel(R) Iris(R) Graphics 540" )
NAMEDDEVICE( 0x1927, SKL_2x3x8, "Intel(R) Iris(R) Graphics 550" )
DEVICE( 0x1932, SKL_3x3x8 )
NAMEDDEVICE( 0x193B, SKL_3x3x8, "Intel(R) Iris(R) Pro Graphics 580" )
NAMEDDEVICE( 0x193A, SKL_3x3x8, "Intel(R) Iris(R) Pro Graphics P580" )
NAMEDDEVICE( 0x193D, SKL_3x3x8, "Intel(R) Iris(R) Pro Graphics P580" )
#endif
#ifdef SUPPORT_KBL
// GT1
NAMEDDEVICE( 0x5902, KBL_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics 610" )
NAMEDDEVICE( 0x590B, KBL_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics 610" )
DEVICE( 0x590A, KBL_1x2x6, GTTYPE_GT1 )
NAMEDDEVICE( 0x5906, KBL_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics 610" )
DEVICE( 0x590E, KBL_1x3x6, GTTYPE_GT1 )
DEVICE( 0x5908, KBL_1x2x6, GTTYPE_GT1 )
// GT1_5
DEVICE( 0x5913, KBL_1x3x6, GTTYPE_GT1_5 )
DEVICE( 0x5915, KBL_1x2x6, GTTYPE_GT1_5 )
// GT2
NAMEDDEVICE( 0x5912, KBL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 630" )
NAMEDDEVICE( 0x591B, KBL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 630" )
NAMEDDEVICE( 0x5917, KBL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 620" )
DEVICE( 0x591A, KBL_1x3x8, GTTYPE_GT2 )
NAMEDDEVICE( 0x5916, KBL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 620" )
NAMEDDEVICE( 0x591E, KBL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 615" )
NAMEDDEVICE( 0x591D, KBL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics P630" )
NAMEDDEVICE( 0x591C, KBL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 615" )
NAMEDDEVICE( 0x5921, KBL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 620" )
// GT3
NAMEDDEVICE( 0x5926, KBL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Plus Graphics 640" )
NAMEDDEVICE( 0x5927, KBL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Plus Graphics 650" )
DEVICE( 0x592B, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x592A, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x5923, KBL_2x3x8, GTTYPE_GT3 )
// GT4
DEVICE( 0x5932, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x593B, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x593A, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x593D, KBL_3x3x8, GTTYPE_GT4 )
NAMEDDEVICE( 0x5902, KBL_1x2x6, "Intel(R) HD Graphics 610" )
NAMEDDEVICE( 0x590B, KBL_1x2x6, "Intel(R) HD Graphics 610" )
DEVICE( 0x590A, KBL_1x2x6 )
NAMEDDEVICE( 0x5906, KBL_1x2x6, "Intel(R) HD Graphics 610" )
DEVICE( 0x590E, KBL_1x3x6 )
DEVICE( 0x5908, KBL_1x2x6 )
DEVICE( 0x5913, KBL_1x3x6 )
DEVICE( 0x5915, KBL_1x2x6 )
NAMEDDEVICE( 0x5912, KBL_1x3x8, "Intel(R) HD Graphics 630" )
NAMEDDEVICE( 0x591B, KBL_1x3x8, "Intel(R) HD Graphics 630" )
NAMEDDEVICE( 0x5917, KBL_1x3x8, "Intel(R) UHD Graphics 620" )
DEVICE( 0x591A, KBL_1x3x8 )
NAMEDDEVICE( 0x5916, KBL_1x3x8, "Intel(R) HD Graphics 620" )
NAMEDDEVICE( 0x591E, KBL_1x3x8, "Intel(R) HD Graphics 615" )
NAMEDDEVICE( 0x591D, KBL_1x3x8, "Intel(R) HD Graphics P630" )
NAMEDDEVICE( 0x591C, KBL_1x3x8, "Intel(R) UHD Graphics 615" )
NAMEDDEVICE( 0x5921, KBL_1x3x8, "Intel(R) HD Graphics 620" )
NAMEDDEVICE( 0x5926, KBL_2x3x8, "Intel(R) Iris(R) Plus Graphics 640" )
NAMEDDEVICE( 0x5927, KBL_2x3x8, "Intel(R) Iris(R) Plus Graphics 650" )
DEVICE( 0x592B, KBL_2x3x8 )
DEVICE( 0x592A, KBL_2x3x8 )
DEVICE( 0x5923, KBL_2x3x8 )
DEVICE( 0x5932, KBL_3x3x8 )
DEVICE( 0x593B, KBL_3x3x8 )
DEVICE( 0x593A, KBL_3x3x8 )
DEVICE( 0x593D, KBL_3x3x8 )
#endif
#ifdef SUPPORT_CFL
// GT1
NAMEDDEVICE( 0x3E90, CFL_1x2x6, GTTYPE_GT1, "Intel(R) UHD Graphics 610" )
NAMEDDEVICE( 0x3E93, CFL_1x2x6, GTTYPE_GT1, "Intel(R) UHD Graphics 610" )
DEVICE( 0x3EA4, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x3E99, CFL_1x2x6, GTTYPE_GT1 )
NAMEDDEVICE( 0x3EA1, CFL_1x2x6, GTTYPE_GT1, "Intel(R) UHD Graphics 610" )
// GT2
NAMEDDEVICE( 0x3E92, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x3E9B, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x3E94, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x3E91, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x3E96, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x3E9A, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics P630" )
DEVICE( 0x3EA3, CFL_1x3x8, GTTYPE_GT2 )
NAMEDDEVICE( 0x3EA9, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 620" )
NAMEDDEVICE( 0x3EA0, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 620" )
NAMEDDEVICE( 0x3E98, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 630" )
// GT3
DEVICE( 0x3E95, CFL_2x3x8, GTTYPE_GT3 )
NAMEDDEVICE( 0x3EA6, CFL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Plus Graphics 645" )
DEVICE( 0x3EA7, CFL_2x3x8, GTTYPE_GT3 )
NAMEDDEVICE( 0x3EA8, CFL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Plus Graphics 655" )
NAMEDDEVICE( 0x3EA5, CFL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Plus Graphics 655" )
DEVICE( 0x3EA2, CFL_2x3x8, GTTYPE_GT3 )
// CML GT1
NAMEDDEVICE( 0x9B21, CFL_1x2x6, GTTYPE_GT1, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9BAA, CFL_1x2x6, GTTYPE_GT1, "Intel(R) UHD Graphics" )
DEVICE( 0x9BAB, CFL_1x2x6, GTTYPE_GT1 )
NAMEDDEVICE( 0x9BAC, CFL_1x2x6, GTTYPE_GT1, "Intel(R) UHD Graphics" )
DEVICE( 0x9BA0, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BA5, CFL_1x2x6, GTTYPE_GT1 )
NAMEDDEVICE( 0x9BA8, CFL_1x2x6, GTTYPE_GT1, "Intel(R) UHD Graphics 610" )
DEVICE( 0x9BA4, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BA2, CFL_1x2x6, GTTYPE_GT1 )
// CML GT2
NAMEDDEVICE( 0x9B41, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9BCA, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics" )
DEVICE( 0x9BCB, CFL_1x3x8, GTTYPE_GT2 )
NAMEDDEVICE( 0x9BCC, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics" )
DEVICE( 0x9BC0, CFL_1x3x8, GTTYPE_GT2 )
NAMEDDEVICE( 0x9BC5, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x9BC8, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x9BC4, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics" )
DEVICE( 0x9BC2, CFL_1x3x8, GTTYPE_GT2 )
// CML WORKSTATION
NAMEDDEVICE( 0x9BC6, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x9BE6, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x9BF6, CFL_1x3x8, GTTYPE_GT2, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x3E90, CFL_1x2x6, "Intel(R) UHD Graphics 610" )
NAMEDDEVICE( 0x3E93, CFL_1x2x6, "Intel(R) UHD Graphics 610" )
DEVICE( 0x3EA4, CFL_1x2x6 )
DEVICE( 0x3E99, CFL_1x2x6 )
NAMEDDEVICE( 0x3EA1, CFL_1x2x6, "Intel(R) UHD Graphics 610" )
NAMEDDEVICE( 0x3E92, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x3E9B, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x3E94, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x3E91, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x3E96, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x3E9A, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
DEVICE( 0x3EA3, CFL_1x3x8 )
NAMEDDEVICE( 0x3EA9, CFL_1x3x8, "Intel(R) UHD Graphics 620" )
NAMEDDEVICE( 0x3EA0, CFL_1x3x8, "Intel(R) UHD Graphics 620" )
NAMEDDEVICE( 0x3E98, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
DEVICE( 0x3E95, CFL_2x3x8 )
NAMEDDEVICE( 0x3EA6, CFL_2x3x8, "Intel(R) Iris(R) Plus Graphics 645" )
DEVICE( 0x3EA7, CFL_2x3x8 )
NAMEDDEVICE( 0x3EA8, CFL_2x3x8, "Intel(R) Iris(R) Plus Graphics 655" )
NAMEDDEVICE( 0x3EA5, CFL_2x3x8, "Intel(R) Iris(R) Plus Graphics 655" )
DEVICE( 0x3EA2, CFL_2x3x8 )
NAMEDDEVICE( 0x9B21, CFL_1x2x6, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9BAA, CFL_1x2x6, "Intel(R) UHD Graphics" )
DEVICE( 0x9BAB, CFL_1x2x6 )
NAMEDDEVICE( 0x9BAC, CFL_1x2x6, "Intel(R) UHD Graphics" )
DEVICE( 0x9BA0, CFL_1x2x6 )
DEVICE( 0x9BA5, CFL_1x2x6 )
NAMEDDEVICE( 0x9BA8, CFL_1x2x6, "Intel(R) UHD Graphics 610" )
DEVICE( 0x9BA4, CFL_1x2x6 )
DEVICE( 0x9BA2, CFL_1x2x6 )
NAMEDDEVICE( 0x9B41, CFL_1x3x8, "Intel(R) UHD Graphics" )
NAMEDDEVICE( 0x9BCA, CFL_1x3x8, "Intel(R) UHD Graphics" )
DEVICE( 0x9BCB, CFL_1x3x8 )
NAMEDDEVICE( 0x9BCC, CFL_1x3x8, "Intel(R) UHD Graphics" )
DEVICE( 0x9BC0, CFL_1x3x8 )
NAMEDDEVICE( 0x9BC5, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x9BC8, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
NAMEDDEVICE( 0x9BC4, CFL_1x3x8, "Intel(R) UHD Graphics" )
DEVICE( 0x9BC2, CFL_1x3x8 )
NAMEDDEVICE( 0x9BC6, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x9BE6, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
NAMEDDEVICE( 0x9BF6, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
#endif
#ifdef SUPPORT_GLK
NAMEDDEVICE( 0x3184, GLK_1x3x6, GTTYPE_GTA, "Intel(R) UHD Graphics 605" )
NAMEDDEVICE( 0x3185, GLK_1x2x6, GTTYPE_GTA, "Intel(R) UHD Graphics 600" )
NAMEDDEVICE( 0x3184, GLK_1x3x6, "Intel(R) UHD Graphics 605" )
NAMEDDEVICE( 0x3185, GLK_1x2x6, "Intel(R) UHD Graphics 600" )
#endif
#ifdef SUPPORT_BXT
DEVICE( 0x9906, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x9907, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x0A84, BXT_1x3x6, GTTYPE_GTA)
NAMEDDEVICE( 0x5A84, BXT_1x3x6, GTTYPE_GTA, "Intel(R) HD Graphics 505" ) //18EU APL
NAMEDDEVICE( 0x5A85, BXT_1x2x6, GTTYPE_GTA, "Intel(R) HD Graphics 500" ) //12EU APL
DEVICE( 0x1A85, BXT_1x2x6, GTTYPE_GTA) //12EU APL
DEVICE( 0x1A84, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x9908, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x9906, BXT_1x3x6)
DEVICE( 0x9907, BXT_1x3x6)
DEVICE( 0x0A84, BXT_1x3x6)
NAMEDDEVICE( 0x5A84, BXT_1x3x6, "Intel(R) HD Graphics 505" )
NAMEDDEVICE( 0x5A85, BXT_1x2x6, "Intel(R) HD Graphics 500" )
DEVICE( 0x1A85, BXT_1x2x6)
DEVICE( 0x1A84, BXT_1x3x6)
DEVICE( 0x9908, BXT_1x3x6)
#endif
#endif
#ifdef SUPPORT_GEN8
// GT1
DEVICE( 0x1602, BDW_1x2x6, GTTYPE_GT1 )
DEVICE( 0x160A, BDW_1x2x6, GTTYPE_GT1 )
DEVICE( 0x1606, BDW_1x2x6, GTTYPE_GT1 )
NAMEDDEVICE( 0x160E, BDW_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics" )
DEVICE( 0x160D, BDW_1x2x6, GTTYPE_GT1 )
// GT2
NAMEDDEVICE( 0x1612, BDW_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 5600" )
NAMEDDEVICE( 0x161A, BDW_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics P5700" )
NAMEDDEVICE( 0x1616, BDW_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 5500" )
NAMEDDEVICE( 0x161E, BDW_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 5300" )
DEVICE( 0x161D, BDW_1x3x8, GTTYPE_GT2 )
// GT3
DEVICE( 0x1622, BDW_2x3x8, GTTYPE_GT3 )
NAMEDDEVICE( 0x162A, BDW_2x3x8, GTTYPE_GT3, "Intel(R) Iris(TM) Pro Graphics P6300" )
NAMEDDEVICE( 0x1626, BDW_2x3x8, GTTYPE_GT3, "Intel(R) HD Graphics 6000" )
DEVICE( 0x162B, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( 0x162E, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( 0x162D, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( 0x1602, BDW_1x2x6 )
DEVICE( 0x160A, BDW_1x2x6 )
DEVICE( 0x1606, BDW_1x2x6 )
NAMEDDEVICE( 0x160E, BDW_1x2x6, "Intel(R) HD Graphics" )
DEVICE( 0x160D, BDW_1x2x6 )
NAMEDDEVICE( 0x1612, BDW_1x3x8, "Intel(R) HD Graphics 5600" )
NAMEDDEVICE( 0x161A, BDW_1x3x8, "Intel(R) HD Graphics P5700" )
NAMEDDEVICE( 0x1616, BDW_1x3x8, "Intel(R) HD Graphics 5500" )
NAMEDDEVICE( 0x161E, BDW_1x3x8, "Intel(R) HD Graphics 5300" )
DEVICE( 0x161D, BDW_1x3x8 )
DEVICE( 0x1622, BDW_2x3x8 )
NAMEDDEVICE( 0x162A, BDW_2x3x8, "Intel(R) Iris(TM) Pro Graphics P6300" )
NAMEDDEVICE( 0x1626, BDW_2x3x8, "Intel(R) HD Graphics 6000" )
DEVICE( 0x162B, BDW_2x3x8 )
DEVICE( 0x162E, BDW_2x3x8 )
DEVICE( 0x162D, BDW_2x3x8 )
#endif
// clang-format on

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -24,12 +24,12 @@
namespace NEO {
const DeviceDescriptor deviceDescriptorTable[] = {
#define NAMEDDEVICE(devId, gt, gtType, devName) {devId, &gt::hwInfo, &gt::setupHardwareInfo, gtType, devName},
#define DEVICE(devId, gt, gtType) {devId, &gt::hwInfo, &gt::setupHardwareInfo, gtType, ""},
#define NAMEDDEVICE(devId, gt, devName) {devId, &gt::hwInfo, &gt::setupHardwareInfo, devName},
#define DEVICE(devId, gt) {devId, &gt::hwInfo, &gt::setupHardwareInfo, ""},
#include "devices.inl"
#undef DEVICE
#undef NAMEDDEVICE
{0, nullptr, nullptr, GTTYPE_UNDEFINED}};
{0, nullptr, nullptr}};
Drm *Drm::create(std::unique_ptr<HwDeviceIdDrm> &&hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment) {
std::unique_ptr<Drm> drmObject;
@@ -55,11 +55,9 @@ Drm *Drm::create(std::unique_ptr<HwDeviceIdDrm> &&hwDeviceId, RootDeviceEnvironm
const DeviceDescriptor *device = nullptr;
const char *devName = "";
GTTYPE eGtType = GTTYPE_UNDEFINED;
for (auto &d : deviceDescriptorTable) {
if (drmObject->deviceId == d.deviceId) {
device = &d;
eGtType = d.eGtType;
devName = d.devName;
break;
}
@@ -69,7 +67,6 @@ Drm *Drm::create(std::unique_ptr<HwDeviceIdDrm> &&hwDeviceId, RootDeviceEnvironm
if (ret != 0) {
return nullptr;
}
drmObject->setGtType(eGtType);
rootDeviceEnvironment.setHwInfo(device->pHwInfo);
rootDeviceEnvironment.getMutableHardwareInfo()->capabilityTable.deviceName = devName;
} else {

View File

@@ -112,9 +112,7 @@ void SKL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
featureTable->flags.ftrFbc2AddressTranslation = true;
featureTable->flags.ftrFbcBlitterTracking = true;
featureTable->flags.ftrFbcCpuTracking = true;
featureTable->flags.ftrVcs2 = featureTable->flags.ftrGT3 || featureTable->flags.ftrGT4;
featureTable->flags.ftrVEBOX = true;
featureTable->flags.ftrSingleVeboxSlice = featureTable->flags.ftrGT1 || featureTable->flags.ftrGT2;
featureTable->flags.ftrTileY = true;
workaroundTable->flags.waEnablePreemptionGranularityControlByUMD = true;

View File

@@ -51,7 +51,6 @@ struct DeviceDescriptor { // NOLINT(clang-analyzer-optin.performance.Padding)
unsigned short deviceId;
const HardwareInfo *pHwInfo;
void (*setupHardwareInfo)(HardwareInfo *, bool);
GTTYPE eGtType;
const char *devName;
};
@@ -128,8 +127,6 @@ class Drm : public DriverModel {
unsigned int bindDrmContext(uint32_t drmContextId, uint32_t deviceIndex, aub_stream::EngineType engineType, bool engineInstancedDevice);
void setGtType(GTTYPE eGtType) { this->eGtType = eGtType; }
GTTYPE getGtType() const { return this->eGtType; }
MOCKABLE_VIRTUAL int getErrno();
bool setQueueSliceCount(uint64_t sliceCount);
void checkQueueSliceSupport();
@@ -327,7 +324,6 @@ class Drm : public DriverModel {
int deviceId = 0;
int revisionId = 0;
GTTYPE eGtType = GTTYPE_UNDEFINED;
bool sliceCountChangeSupported = false;
bool preemptionSupported = false;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -143,22 +143,6 @@ int HwInfoConfig::configureHwInfoDrm(const HardwareInfo *inHwInfo, HardwareInfo
int maxGpuFreq = 0;
drm->getMaxGpuFrequency(*outHwInfo, maxGpuFreq);
GTTYPE gtType = drm->getGtType();
if (gtType == GTTYPE_UNDEFINED) {
*outHwInfo = {};
return -1;
}
platform->eGTType = gtType;
featureTable->flags.ftrGTA = (gtType == GTTYPE_GTA) ? 1 : 0;
featureTable->flags.ftrGTC = (gtType == GTTYPE_GTC) ? 1 : 0;
featureTable->flags.ftrGTX = (gtType == GTTYPE_GTX) ? 1 : 0;
featureTable->flags.ftrGT1 = (gtType == GTTYPE_GT1) ? 1 : 0;
featureTable->flags.ftrGT1_5 = (gtType == GTTYPE_GT1_5) ? 1 : 0;
featureTable->flags.ftrGT2 = (gtType == GTTYPE_GT2) ? 1 : 0;
featureTable->flags.ftrGT2_5 = (gtType == GTTYPE_GT2_5) ? 1 : 0;
featureTable->flags.ftrGT3 = (gtType == GTTYPE_GT3) ? 1 : 0;
featureTable->flags.ftrGT4 = (gtType == GTTYPE_GT4) ? 1 : 0;
ret = configureHardwareCustom(outHwInfo, osIface);
if (ret != 0) {
*outHwInfo = {};