x11-servers/xorg-server: Packport intel PCI IDs

Backport PCI IDs for various intel graphics cards, to enable MESA with these
graphics cards.  According to upstream, it is safe to backport PCI IDs,
worst case is MESA fails to initialize and fall back to software rendering,
which would be the case without this patch anyway.

PR:		233221
Tested by:	Yuri Pankov

2 files changed, 172 insertions, 1 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 8052600a8717..ca66ff787193 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION?=	1.18.4
-PORTREVISION?=	11
+PORTREVISION?=	12
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_dri2_pci__ids_i965__pci__ids.h b/x11-servers/xorg-server/files/patch-hw_xfree86_dri2_pci__ids_i965__pci__ids.h
new file mode 100644
index 000000000000..71b74b31abd1
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_dri2_pci__ids_i965__pci__ids.h
@@ -0,0 +1,171 @@
+--- hw/xfree86/dri2/pci_ids/i965_pci_ids.h.orig	2019-09-10 16:20:34 UTC
++++ hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+@@ -1,3 +1,4 @@
++#ifndef IRIS
+ CHIPSET(0x29A2, i965,    "Intel(R) 965G")
+ CHIPSET(0x2992, i965,    "Intel(R) 965Q")
+ CHIPSET(0x2982, i965,    "Intel(R) 965G")
+@@ -91,6 +92,11 @@ CHIPSET(0x0F32, byt,     "Intel(R) Bay Trail")
+ CHIPSET(0x0F33, byt,     "Intel(R) Bay Trail")
+ CHIPSET(0x0157, byt,     "Intel(R) Bay Trail")
+ CHIPSET(0x0155, byt,     "Intel(R) Bay Trail")
++CHIPSET(0x22B0, chv,     "Intel(R) HD Graphics (Cherrytrail)")
++CHIPSET(0x22B1, chv,     "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */
++CHIPSET(0x22B2, chv,     "Intel(R) HD Graphics (Cherryview)")
++CHIPSET(0x22B3, chv,     "Intel(R) HD Graphics (Cherryview)")
++#endif
+ CHIPSET(0x1602, bdw_gt1, "Intel(R) Broadwell GT1")
+ CHIPSET(0x1606, bdw_gt1, "Intel(R) Broadwell GT1")
+ CHIPSET(0x160A, bdw_gt1, "Intel(R) Broadwell GT1")
+@@ -112,6 +118,7 @@ CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
+ CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
+ CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
+ CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
++CHIPSET(0x190B, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
+ CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
+ CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
+ CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
+@@ -122,42 +129,113 @@ CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
+ CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
+ CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
+ CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
+-CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
+-CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
+-CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
++CHIPSET(0x1921, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
++CHIPSET(0x1923, skl_gt3, "Intel(R) Skylake GT3e")
++CHIPSET(0x1926, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
+ CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
+ CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
+-CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
+-CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
+-CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
+-CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
+-CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
+-CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
+-CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
++CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics 555 (Skylake GT3e)")
++CHIPSET(0x192D, skl_gt3, "Intel(R) Iris Graphics P555 (Skylake GT3e)")
++CHIPSET(0x1932, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)")
++CHIPSET(0x193A, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)")
++CHIPSET(0x193B, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)")
++CHIPSET(0x193D, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)")
++CHIPSET(0x0A84, bxt,     "Intel(R) HD Graphics (Broxton)")
++CHIPSET(0x1A84, bxt,     "Intel(R) HD Graphics (Broxton)")
++CHIPSET(0x1A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)")
++CHIPSET(0x5A84, bxt,     "Intel(R) HD Graphics 505 (Broxton)")
++CHIPSET(0x5A85, bxt_2x6, "Intel(R) HD Graphics 500 (Broxton 2x6)")
++CHIPSET(0x5902, kbl_gt1, "Intel(R) HD Graphics 610 (Kaby Lake GT1)")
++CHIPSET(0x5906, kbl_gt1, "Intel(R) HD Graphics 610 (Kaby Lake GT1)")
+ CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
++CHIPSET(0x5908, kbl_gt1, "Intel(R) Kabylake GT1")
+ CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
+ CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
+ CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
+ CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
+-CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
+-CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2")
+-CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2")
+-CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2")
+-CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
+-CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
+-CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
++CHIPSET(0x5917, kbl_gt2, "Intel(R) UHD Graphics 620 (Kabylake GT2)")
++CHIPSET(0x5912, kbl_gt2, "Intel(R) HD Graphics 630 (Kaby Lake GT2)")
++CHIPSET(0x5916, kbl_gt2, "Intel(R) HD Graphics 620 (Kaby Lake GT2)")
++CHIPSET(0x591A, kbl_gt2, "Intel(R) HD Graphics P630 (Kaby Lake GT2)")
++CHIPSET(0x591B, kbl_gt2, "Intel(R) HD Graphics 630 (Kaby Lake GT2)")
++CHIPSET(0x591D, kbl_gt2, "Intel(R) HD Graphics P630 (Kaby Lake GT2)")
++CHIPSET(0x591E, kbl_gt2, "Intel(R) HD Graphics 615 (Kaby Lake GT2)")
+ CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
+-CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3")
+-CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3")
+-CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3")
+-CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4")
+-CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4")
++CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3")
++CHIPSET(0x5926, kbl_gt3, "Intel(R) Iris Plus Graphics 640 (Kaby Lake GT3e)")
++CHIPSET(0x5927, kbl_gt3, "Intel(R) Iris Plus Graphics 650 (Kaby Lake GT3e)")
+ CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4")
+-CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4")
+-CHIPSET(0x22B0, chv,     "Intel(R) HD Graphics (Cherryview)")
+-CHIPSET(0x22B1, chv,     "Intel(R) HD Graphics (Cherryview)")
+-CHIPSET(0x22B2, chv,     "Intel(R) HD Graphics (Cherryview)")
+-CHIPSET(0x22B3, chv,     "Intel(R) HD Graphics (Cherryview)")
+-CHIPSET(0x0A84, bxt,     "Intel(R) HD Graphics (Broxton)")
+-CHIPSET(0x1A84, bxt,     "Intel(R) HD Graphics (Broxton)")
+-CHIPSET(0x5A84, bxt,     "Intel(R) HD Graphics (Broxton)")
++CHIPSET(0x591C, kbl_gt2, "Intel(R) Amber Lake (Kabylake) GT2")
++CHIPSET(0x87C0, kbl_gt2, "Intel(R) Amber Lake (Kabylake) GT2")
++CHIPSET(0x87CA, cfl_gt2, "Intel(R) Amber Lake (Coffeelake) GT2")
++CHIPSET(0x3184, glk,     "Intel(R) UHD Graphics 605 (Geminilake)")
++CHIPSET(0x3185, glk_2x6, "Intel(R) UHD Graphics 600 (Geminilake 2x6)")
++CHIPSET(0x3E90, cfl_gt1, "Intel(R) UHD Graphics 610 (Coffeelake 2x6 GT1)")
++CHIPSET(0x3E93, cfl_gt1, "Intel(R) UHD Graphics 610 (Coffeelake 2x6 GT1)")
++CHIPSET(0x3E99, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
++CHIPSET(0x3E9C, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
++CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
++CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
++CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
++CHIPSET(0x3E98, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
++CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
++CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
++CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
++CHIPSET(0x3EA9, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
++CHIPSET(0x3EA5, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
++CHIPSET(0x3EA6, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
++CHIPSET(0x3EA7, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
++CHIPSET(0x3EA8, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
++CHIPSET(0x3EA1, cfl_gt1, "Intel(R) HD Graphics (Whiskey Lake 2x6 GT1)")
++CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT1)")
++CHIPSET(0x3EA0, cfl_gt2, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT2)")
++CHIPSET(0x3EA3, cfl_gt2, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT2)")
++CHIPSET(0x3EA2, cfl_gt3, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT3)")
++CHIPSET(0x9B21, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9BA0, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9BA2, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9BA4, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9BA5, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9BA8, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9BAA, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9BAB, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9BAC, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
++CHIPSET(0x9B41, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x9BC0, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x9BC2, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x9BC4, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x9BC5, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x9BC8, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x9BCA, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x9BCB, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x9BCC, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
++CHIPSET(0x5A49, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
++CHIPSET(0x5A4A, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
++CHIPSET(0x5A41, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
++CHIPSET(0x5A42, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
++CHIPSET(0x5A44, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
++CHIPSET(0x5A59, cnl_4x8, "Intel(R) HD Graphics (Cannonlake 4x8 GT1.5)")
++CHIPSET(0x5A5A, cnl_4x8, "Intel(R) HD Graphics (Cannonlake 4x8 GT1.5)")
++CHIPSET(0x5A5C, cnl_4x8, "Intel(R) HD Graphics (Cannonlake 4x8 GT1.5)")
++CHIPSET(0x5A50, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
++CHIPSET(0x5A51, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
++CHIPSET(0x5A52, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
++CHIPSET(0x5A54, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
++CHIPSET(0x8A50, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
++CHIPSET(0x8A51, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
++CHIPSET(0x8A52, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
++CHIPSET(0x8A53, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
++CHIPSET(0x8A54, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
++CHIPSET(0x8A56, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
++CHIPSET(0x8A57, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
++CHIPSET(0x8A58, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
++CHIPSET(0x8A59, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
++CHIPSET(0x8A5A, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
++CHIPSET(0x8A5B, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
++CHIPSET(0x8A5C, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
++CHIPSET(0x8A5D, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
++CHIPSET(0x8A71, icl_1x8, "Intel(R) HD Graphics (Ice Lake 1x8 GT0.5)")
++CHIPSET(0x4500, ehl_4x8, "Intel(R) HD Graphics (Elkhart Lake 4x8)")
++CHIPSET(0x4571, ehl_4x8, "Intel(R) HD Graphics (Elkhart Lake 4x8)")
++CHIPSET(0x4551, ehl_4x4, "Intel(R) HD Graphics (Elkhart Lake 4x4)")
++CHIPSET(0x4541, ehl_2x4, "Intel(R) HD Graphics (Elkhart Lake 2x4)")