From a63760f01a5a318660d110db8ad3f270e4b6d0d6 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 9 Apr 2021 12:15:01 -0700 Subject: [PATCH] include/pci_ids: Move PCI ids supported by both i965 and iris to iris As crocus won't support any of these (BDW+) they should go into iris. This also allows us to remove the "prefer_iris" option, as iris is now the only option Reviewed-by: Emma Anholt Acked-by: Jason Ekstrand Acked-by: Kenneth Graunke Reviewed-by: Adam Jackson Part-of: --- include/pci_ids/iris_pci_ids.h | 152 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h index c5c2dd5..4d58451 100644 --- a/include/pci_ids/iris_pci_ids.h +++ b/include/pci_ids/iris_pci_ids.h @@ -1,3 +1,155 @@ +CHIPSET(0x1602, bdw_gt1, "BDW GT1", "Intel(R) HD Graphics") +CHIPSET(0x1606, bdw_gt1, "BDW GT1", "Intel(R) HD Graphics") +CHIPSET(0x160A, bdw_gt1, "BDW GT1", "Intel(R) HD Graphics") +CHIPSET(0x160B, bdw_gt1, "BDW GT1", "Intel(R) HD Graphics") +CHIPSET(0x160D, bdw_gt1, "BDW GT1", "Intel(R) HD Graphics") +CHIPSET(0x160E, bdw_gt1, "BDW GT1", "Intel(R) HD Graphics") +CHIPSET(0x1612, bdw_gt2, "BDW GT2", "Intel(R) HD Graphics 5600") +CHIPSET(0x1616, bdw_gt2, "BDW GT2", "Intel(R) HD Graphics 5500") +CHIPSET(0x161A, bdw_gt2, "BDW GT2", "Intel(R) HD Graphics P5700") +CHIPSET(0x161B, bdw_gt2, "BDW GT2", "Intel(R) HD Graphics") +CHIPSET(0x161D, bdw_gt2, "BDW GT2", "Intel(R) HD Graphics") +CHIPSET(0x161E, bdw_gt2, "BDW GT2", "Intel(R) HD Graphics 5300") +CHIPSET(0x1622, bdw_gt3, "BDW GT3", "Intel(R) Iris(R) Pro Graphics 6200") +CHIPSET(0x1626, bdw_gt3, "BDW GT3", "Intel(R) HD Graphics 6000") +CHIPSET(0x162A, bdw_gt3, "BDW GT3", "Intel(R) Iris(R) Pro Graphics P6300") +CHIPSET(0x162B, bdw_gt3, "BDW GT3", "Intel(R) Iris(R) Graphics 6100") +CHIPSET(0x162D, bdw_gt3, "BDW GT3", "Intel(R) HD Graphics") +CHIPSET(0x162E, bdw_gt3, "BDW GT3", "Intel(R) HD Graphics") + +CHIPSET(0x1902, skl_gt1, "SKL GT1", "Intel(R) HD Graphics 510") +CHIPSET(0x1906, skl_gt1, "SKL GT1", "Intel(R) HD Graphics 510") +CHIPSET(0x190A, skl_gt1, "SKL GT1", "Intel(R) HD Graphics") +CHIPSET(0x190B, skl_gt1, "SKL GT1", "Intel(R) HD Graphics 510") +CHIPSET(0x190E, skl_gt1, "SKL GT1", "Intel(R) HD Graphics") +CHIPSET(0x1912, skl_gt2, "SKL GT2", "Intel(R) HD Graphics 530") +CHIPSET(0x1913, skl_gt2, "SKL GT2F", "Intel(R) HD Graphics") +CHIPSET(0x1915, skl_gt2, "SKL GT2F", "Intel(R) HD Graphics") +CHIPSET(0x1916, skl_gt2, "SKL GT2", "Intel(R) HD Graphics 520") +CHIPSET(0x1917, skl_gt2, "SKL GT2F", "Intel(R) HD Graphics") +CHIPSET(0x191A, skl_gt2, "SKL GT2", "Intel(R) HD Graphics") +CHIPSET(0x191B, skl_gt2, "SKL GT2", "Intel(R) HD Graphics 530") +CHIPSET(0x191D, skl_gt2, "SKL GT2", "Intel(R) HD Graphics P530") +CHIPSET(0x191E, skl_gt2, "SKL GT2", "Intel(R) HD Graphics 515") +CHIPSET(0x1921, skl_gt2, "SKL GT2", "Intel(R) HD Graphics 520") +CHIPSET(0x1923, skl_gt3, "SKL GT3", "Intel(R) HD Graphics 535") +CHIPSET(0x1926, skl_gt3, "SKL GT3", "Intel(R) Iris(R) Graphics 540") +CHIPSET(0x1927, skl_gt3, "SKL GT3", "Intel(R) Iris(R) Graphics 550") +CHIPSET(0x192A, skl_gt4, "SKL GT4", "Intel(R) HD Graphics") +CHIPSET(0x192B, skl_gt3, "SKL GT3", "Intel(R) Iris(R) Graphics 555") +CHIPSET(0x192D, skl_gt3, "SKL GT3", "Intel(R) Iris(R) Graphics P555") +CHIPSET(0x1932, skl_gt4, "SKL GT4", "Intel(R) Iris(R) Pro Graphics 580") +CHIPSET(0x193A, skl_gt4, "SKL GT4", "Intel(R) Iris(R) Pro Graphics P580") +CHIPSET(0x193B, skl_gt4, "SKL GT4", "Intel(R) Iris(R) Pro Graphics 580") +CHIPSET(0x193D, skl_gt4, "SKL GT4", "Intel(R) Iris(R) Pro Graphics P580") + +CHIPSET(0x0A84, bxt, "BXT 3", "Intel(R) HD Graphics") +CHIPSET(0x1A84, bxt, "BXT 3", "Intel(R) HD Graphics") +CHIPSET(0x1A85, bxt_2x6, "BXT 2", "Intel(R) HD Graphics") +CHIPSET(0x5A84, bxt, "APL 3", "Intel(R) HD Graphics 505") +CHIPSET(0x5A85, bxt_2x6, "APL 2", "Intel(R) HD Graphics 500") + +CHIPSET(0x3184, glk, "GLK 3", "Intel(R) UHD Graphics 605") +CHIPSET(0x3185, glk_2x6, "GLK 2", "Intel(R) UHD Graphics 600") + +CHIPSET(0x5902, kbl_gt1, "KBL GT1", "Intel(R) HD Graphics 610") +CHIPSET(0x5906, kbl_gt1, "KBL GT1", "Intel(R) HD Graphics 610") +CHIPSET(0x590A, kbl_gt1, "KBL GT1", "Intel(R) HD Graphics") +CHIPSET(0x5908, kbl_gt1, "KBL GT1", "Intel(R) HD Graphics") +CHIPSET(0x590B, kbl_gt1, "KBL GT1", "Intel(R) HD Graphics 610") +CHIPSET(0x590E, kbl_gt1, "KBL GT1", "Intel(R) HD Graphics") +CHIPSET(0x5913, kbl_gt1_5, "KBL GT1.5", "Intel(R) HD Graphics") +CHIPSET(0x5915, kbl_gt1_5, "KBL GT1.5", "Intel(R) HD Graphics") +CHIPSET(0x5917, kbl_gt2, "KBL GT2", "Intel(R) UHD Graphics 620") +CHIPSET(0x5912, kbl_gt2, "KBL GT2", "Intel(R) HD Graphics 630") +CHIPSET(0x5916, kbl_gt2, "KBL GT2", "Intel(R) HD Graphics 620") +CHIPSET(0x591A, kbl_gt2, "KBL GT2", "Intel(R) HD Graphics P630") +CHIPSET(0x591B, kbl_gt2, "KBL GT2", "Intel(R) HD Graphics 630") +CHIPSET(0x591D, kbl_gt2, "KBL GT2", "Intel(R) HD Graphics P630") +CHIPSET(0x591E, kbl_gt2, "KBL GT2", "Intel(R) HD Graphics 615") +CHIPSET(0x5921, kbl_gt2, "KBL GT2F", "Intel(R) HD Graphics 620") +CHIPSET(0x5923, kbl_gt3, "KBL GT3", "Intel(R) HD Graphics 635") +CHIPSET(0x5926, kbl_gt3, "KBL GT3", "Intel(R) Iris(R) Plus Graphics 640 (Kaby Lake GT3e)") +CHIPSET(0x5927, kbl_gt3, "KBL GT3", "Intel(R) Iris(R) Plus Graphics 650 (Kaby Lake GT3e)") +CHIPSET(0x593B, kbl_gt4, "KBL GT4", "Intel(R) HD Graphics") + +CHIPSET(0x591C, kbl_gt2, "AML-KBL", "Intel(R) UHD Graphics 615") +CHIPSET(0x87C0, kbl_gt2, "AML-KBL", "Intel(R) UHD Graphics 617") + +CHIPSET(0x87CA, cfl_gt2, "AML-CFL", "Intel(R) UHD Graphics") + +CHIPSET(0x3E90, cfl_gt1, "CFL GT1", "Intel(R) UHD Graphics 610") +CHIPSET(0x3E93, cfl_gt1, "CFL GT1", "Intel(R) UHD Graphics 610") +CHIPSET(0x3E99, cfl_gt1, "CFL GT1", "Intel(R) UHD Graphics 610") +CHIPSET(0x3E9C, cfl_gt1, "CFL GT1", "Intel(R) UHD Graphics 610") +CHIPSET(0x3E91, cfl_gt2, "CFL GT2", "Intel(R) UHD Graphics 630") +CHIPSET(0x3E92, cfl_gt2, "CFL GT2", "Intel(R) UHD Graphics 630") +CHIPSET(0x3E96, cfl_gt2, "CFL GT2", "Intel(R) UHD Graphics P630") +CHIPSET(0x3E98, cfl_gt2, "CFL GT2", "Intel(R) UHD Graphics 630") +CHIPSET(0x3E9A, cfl_gt2, "CFL GT2", "Intel(R) UHD Graphics P630") +CHIPSET(0x3E9B, cfl_gt2, "CFL GT2", "Intel(R) UHD Graphics 630") +CHIPSET(0x3E94, cfl_gt2, "CFL GT2", "Intel(R) UHD Graphics P630") +CHIPSET(0x3EA9, cfl_gt2, "CFL GT2", "Intel(R) UHD Graphics 620") +CHIPSET(0x3EA5, cfl_gt3, "CFL GT3", "Intel(R) Iris(R) Plus Graphics 655") +CHIPSET(0x3EA6, cfl_gt3, "CFL GT3", "Intel(R) Iris(R) Plus Graphics 645") +CHIPSET(0x3EA7, cfl_gt3, "CFL GT3", "Intel(R) HD Graphics") +CHIPSET(0x3EA8, cfl_gt3, "CFL GT3", "Intel(R) Iris(R) Plus Graphics 655") + +CHIPSET(0x3EA1, cfl_gt1, "WHL GT1", "Intel(R) UHD Graphics 610") +CHIPSET(0x3EA4, cfl_gt1, "WHL GT1", "Intel(R) UHD Graphics") +CHIPSET(0x3EA0, cfl_gt2, "WHL GT2", "Intel(R) UHD Graphics 620") +CHIPSET(0x3EA3, cfl_gt2, "WHL GT2", "Intel(R) UHD Graphics") +CHIPSET(0x3EA2, cfl_gt3, "WHL GT3", "Intel(R) UHD Graphics") + +CHIPSET(0x9B21, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics") +CHIPSET(0x9BA0, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics") +CHIPSET(0x9BA2, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics") +CHIPSET(0x9BA4, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics") +CHIPSET(0x9BA5, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics 610") +CHIPSET(0x9BA8, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics 610") +CHIPSET(0x9BAA, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics") +CHIPSET(0x9BAB, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics") +CHIPSET(0x9BAC, cfl_gt1, "CML GT1", "Intel(R) UHD Graphics") +CHIPSET(0x9B41, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics") +CHIPSET(0x9BC0, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics") +CHIPSET(0x9BC2, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics") +CHIPSET(0x9BC4, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics") +CHIPSET(0x9BC5, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics 630") +CHIPSET(0x9BC6, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics P630") +CHIPSET(0x9BC8, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics 630") +CHIPSET(0x9BCA, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics") +CHIPSET(0x9BCB, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics") +CHIPSET(0x9BCC, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics") +CHIPSET(0x9BE6, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics P630") +CHIPSET(0x9BF6, cfl_gt2, "CML GT2", "Intel(R) UHD Graphics P630") + +CHIPSET(0x8A50, icl_gt2, "ICL GT2", "Intel(R) HD Graphics") +CHIPSET(0x8A51, icl_gt2, "ICL GT2", "Intel(R) Iris(R) Plus Graphics") +CHIPSET(0x8A52, icl_gt2, "ICL GT2", "Intel(R) Iris(R) Plus Graphics") +CHIPSET(0x8A53, icl_gt2, "ICL GT2", "Intel(R) Iris(R) Plus Graphics") +CHIPSET(0x8A54, icl_gt1_5, "ICL GT1.5", "Intel(R) Iris(R) Plus Graphics") +CHIPSET(0x8A56, icl_gt1, "ICL GT1", "Intel(R) UHD Graphics") +CHIPSET(0x8A57, icl_gt1_5, "ICL GT1.5", "Intel(R) HD Graphics") +CHIPSET(0x8A58, icl_gt1, "ICL GT1", "Intel(R) UHD Graphics") +CHIPSET(0x8A59, icl_gt1_5, "ICL GT1.5", "Intel(R) HD Graphics") +CHIPSET(0x8A5A, icl_gt1_5, "ICL GT1.5", "Intel(R) Iris(R) Plus Graphics") +CHIPSET(0x8A5B, icl_gt1, "ICL GT1", "Intel(R) HD Graphics") +CHIPSET(0x8A5C, icl_gt1_5, "ICL GT1.5", "Intel(R) Iris(R) Plus Graphics") +CHIPSET(0x8A5D, icl_gt1, "ICL GT1", "Intel(R) HD Graphics") +CHIPSET(0x8A71, icl_gt0_5, "ICL GT0.5", "Intel(R) HD Graphics") + +CHIPSET(0x4500, ehl_4x8, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4541, ehl_2x4, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4551, ehl_4x4, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4555, ehl_2x8, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4557, ehl_4x5, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4571, ehl_4x8, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4E51, ehl_4x4, "JSL", "Intel(R) UHD Graphics") +CHIPSET(0x4E55, ehl_2x8, "JSL", "Intel(R) UHD Graphics") +CHIPSET(0x4E57, ehl_4x5, "JSL", "Intel(R) UHD Graphics") +CHIPSET(0x4E61, ehl_4x6, "JSL", "Intel(R) UHD Graphics") +CHIPSET(0x4E71, ehl_4x8, "JSL", "Intel(R) UHD Graphics") + CHIPSET(0x4c8a, rkl_gt1, "RKL GT1", "Intel(R) Graphics") CHIPSET(0x4c8b, rkl_gt1, "RKL GT1", "Intel(R) Graphics") CHIPSET(0x4c8c, rkl_gt05, "RKL GT0.5", "Intel(R) Graphics") -- 2.7.4