View | Details | Raw Unified | Return to bug 233221 | Differences between
and this patch

Collapse All | Expand All

(-)x11-servers/xorg-server/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME?=	xorg-server
4
PORTNAME?=	xorg-server
5
PORTVERSION?=	1.18.4
5
PORTVERSION?=	1.18.4
6
PORTREVISION?=	11
6
PORTREVISION?=	12
7
PORTEPOCH?=	1
7
PORTEPOCH?=	1
8
CATEGORIES=	x11-servers
8
CATEGORIES=	x11-servers
9
MASTER_SITES=	XORG/individual/xserver
9
MASTER_SITES=	XORG/individual/xserver
(-)x11-servers/xorg-server/files/patch-hw_xfree86_dri2_pci__ids_i965__pci__ids.h (+171 lines)
Line 0 Link Here
1
--- hw/xfree86/dri2/pci_ids/i965_pci_ids.h.orig	2019-09-10 16:20:34 UTC
2
+++ hw/xfree86/dri2/pci_ids/i965_pci_ids.h
3
@@ -1,3 +1,4 @@
4
+#ifndef IRIS
5
 CHIPSET(0x29A2, i965,    "Intel(R) 965G")
6
 CHIPSET(0x2992, i965,    "Intel(R) 965Q")
7
 CHIPSET(0x2982, i965,    "Intel(R) 965G")
8
@@ -91,6 +92,11 @@ CHIPSET(0x0F32, byt,     "Intel(R) Bay Trail")
9
 CHIPSET(0x0F33, byt,     "Intel(R) Bay Trail")
10
 CHIPSET(0x0157, byt,     "Intel(R) Bay Trail")
11
 CHIPSET(0x0155, byt,     "Intel(R) Bay Trail")
12
+CHIPSET(0x22B0, chv,     "Intel(R) HD Graphics (Cherrytrail)")
13
+CHIPSET(0x22B1, chv,     "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */
14
+CHIPSET(0x22B2, chv,     "Intel(R) HD Graphics (Cherryview)")
15
+CHIPSET(0x22B3, chv,     "Intel(R) HD Graphics (Cherryview)")
16
+#endif
17
 CHIPSET(0x1602, bdw_gt1, "Intel(R) Broadwell GT1")
18
 CHIPSET(0x1606, bdw_gt1, "Intel(R) Broadwell GT1")
19
 CHIPSET(0x160A, bdw_gt1, "Intel(R) Broadwell GT1")
20
@@ -112,6 +118,7 @@ CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
21
 CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
22
 CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
23
 CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
24
+CHIPSET(0x190B, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
25
 CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
26
 CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
27
 CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
28
@@ -122,42 +129,113 @@ CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
29
 CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
30
 CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
31
 CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
32
-CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
33
-CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
34
-CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
35
+CHIPSET(0x1921, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
36
+CHIPSET(0x1923, skl_gt3, "Intel(R) Skylake GT3e")
37
+CHIPSET(0x1926, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
38
 CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
39
 CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
40
-CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
41
-CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
42
-CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
43
-CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
44
-CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
45
-CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
46
-CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
47
+CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics 555 (Skylake GT3e)")
48
+CHIPSET(0x192D, skl_gt3, "Intel(R) Iris Graphics P555 (Skylake GT3e)")
49
+CHIPSET(0x1932, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)")
50
+CHIPSET(0x193A, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)")
51
+CHIPSET(0x193B, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)")
52
+CHIPSET(0x193D, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)")
53
+CHIPSET(0x0A84, bxt,     "Intel(R) HD Graphics (Broxton)")
54
+CHIPSET(0x1A84, bxt,     "Intel(R) HD Graphics (Broxton)")
55
+CHIPSET(0x1A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)")
56
+CHIPSET(0x5A84, bxt,     "Intel(R) HD Graphics 505 (Broxton)")
57
+CHIPSET(0x5A85, bxt_2x6, "Intel(R) HD Graphics 500 (Broxton 2x6)")
58
+CHIPSET(0x5902, kbl_gt1, "Intel(R) HD Graphics 610 (Kaby Lake GT1)")
59
+CHIPSET(0x5906, kbl_gt1, "Intel(R) HD Graphics 610 (Kaby Lake GT1)")
60
 CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
61
+CHIPSET(0x5908, kbl_gt1, "Intel(R) Kabylake GT1")
62
 CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
63
 CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
64
 CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
65
 CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
66
-CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
67
-CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2")
68
-CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2")
69
-CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2")
70
-CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
71
-CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
72
-CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
73
+CHIPSET(0x5917, kbl_gt2, "Intel(R) UHD Graphics 620 (Kabylake GT2)")
74
+CHIPSET(0x5912, kbl_gt2, "Intel(R) HD Graphics 630 (Kaby Lake GT2)")
75
+CHIPSET(0x5916, kbl_gt2, "Intel(R) HD Graphics 620 (Kaby Lake GT2)")
76
+CHIPSET(0x591A, kbl_gt2, "Intel(R) HD Graphics P630 (Kaby Lake GT2)")
77
+CHIPSET(0x591B, kbl_gt2, "Intel(R) HD Graphics 630 (Kaby Lake GT2)")
78
+CHIPSET(0x591D, kbl_gt2, "Intel(R) HD Graphics P630 (Kaby Lake GT2)")
79
+CHIPSET(0x591E, kbl_gt2, "Intel(R) HD Graphics 615 (Kaby Lake GT2)")
80
 CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
81
-CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3")
82
-CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3")
83
-CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3")
84
-CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4")
85
-CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4")
86
+CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3")
87
+CHIPSET(0x5926, kbl_gt3, "Intel(R) Iris Plus Graphics 640 (Kaby Lake GT3e)")
88
+CHIPSET(0x5927, kbl_gt3, "Intel(R) Iris Plus Graphics 650 (Kaby Lake GT3e)")
89
 CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4")
90
-CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4")
91
-CHIPSET(0x22B0, chv,     "Intel(R) HD Graphics (Cherryview)")
92
-CHIPSET(0x22B1, chv,     "Intel(R) HD Graphics (Cherryview)")
93
-CHIPSET(0x22B2, chv,     "Intel(R) HD Graphics (Cherryview)")
94
-CHIPSET(0x22B3, chv,     "Intel(R) HD Graphics (Cherryview)")
95
-CHIPSET(0x0A84, bxt,     "Intel(R) HD Graphics (Broxton)")
96
-CHIPSET(0x1A84, bxt,     "Intel(R) HD Graphics (Broxton)")
97
-CHIPSET(0x5A84, bxt,     "Intel(R) HD Graphics (Broxton)")
98
+CHIPSET(0x591C, kbl_gt2, "Intel(R) Amber Lake (Kabylake) GT2")
99
+CHIPSET(0x87C0, kbl_gt2, "Intel(R) Amber Lake (Kabylake) GT2")
100
+CHIPSET(0x87CA, cfl_gt2, "Intel(R) Amber Lake (Coffeelake) GT2")
101
+CHIPSET(0x3184, glk,     "Intel(R) UHD Graphics 605 (Geminilake)")
102
+CHIPSET(0x3185, glk_2x6, "Intel(R) UHD Graphics 600 (Geminilake 2x6)")
103
+CHIPSET(0x3E90, cfl_gt1, "Intel(R) UHD Graphics 610 (Coffeelake 2x6 GT1)")
104
+CHIPSET(0x3E93, cfl_gt1, "Intel(R) UHD Graphics 610 (Coffeelake 2x6 GT1)")
105
+CHIPSET(0x3E99, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
106
+CHIPSET(0x3E9C, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
107
+CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
108
+CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
109
+CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
110
+CHIPSET(0x3E98, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
111
+CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
112
+CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
113
+CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
114
+CHIPSET(0x3EA9, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
115
+CHIPSET(0x3EA5, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
116
+CHIPSET(0x3EA6, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
117
+CHIPSET(0x3EA7, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
118
+CHIPSET(0x3EA8, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
119
+CHIPSET(0x3EA1, cfl_gt1, "Intel(R) HD Graphics (Whiskey Lake 2x6 GT1)")
120
+CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT1)")
121
+CHIPSET(0x3EA0, cfl_gt2, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT2)")
122
+CHIPSET(0x3EA3, cfl_gt2, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT2)")
123
+CHIPSET(0x3EA2, cfl_gt3, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT3)")
124
+CHIPSET(0x9B21, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
125
+CHIPSET(0x9BA0, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
126
+CHIPSET(0x9BA2, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
127
+CHIPSET(0x9BA4, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
128
+CHIPSET(0x9BA5, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
129
+CHIPSET(0x9BA8, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
130
+CHIPSET(0x9BAA, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
131
+CHIPSET(0x9BAB, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
132
+CHIPSET(0x9BAC, cfl_gt1, "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
133
+CHIPSET(0x9B41, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
134
+CHIPSET(0x9BC0, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
135
+CHIPSET(0x9BC2, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
136
+CHIPSET(0x9BC4, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
137
+CHIPSET(0x9BC5, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
138
+CHIPSET(0x9BC8, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
139
+CHIPSET(0x9BCA, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
140
+CHIPSET(0x9BCB, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
141
+CHIPSET(0x9BCC, cfl_gt2, "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
142
+CHIPSET(0x5A49, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
143
+CHIPSET(0x5A4A, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
144
+CHIPSET(0x5A41, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
145
+CHIPSET(0x5A42, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
146
+CHIPSET(0x5A44, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
147
+CHIPSET(0x5A59, cnl_4x8, "Intel(R) HD Graphics (Cannonlake 4x8 GT1.5)")
148
+CHIPSET(0x5A5A, cnl_4x8, "Intel(R) HD Graphics (Cannonlake 4x8 GT1.5)")
149
+CHIPSET(0x5A5C, cnl_4x8, "Intel(R) HD Graphics (Cannonlake 4x8 GT1.5)")
150
+CHIPSET(0x5A50, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
151
+CHIPSET(0x5A51, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
152
+CHIPSET(0x5A52, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
153
+CHIPSET(0x5A54, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
154
+CHIPSET(0x8A50, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
155
+CHIPSET(0x8A51, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
156
+CHIPSET(0x8A52, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
157
+CHIPSET(0x8A53, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
158
+CHIPSET(0x8A54, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
159
+CHIPSET(0x8A56, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
160
+CHIPSET(0x8A57, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
161
+CHIPSET(0x8A58, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
162
+CHIPSET(0x8A59, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
163
+CHIPSET(0x8A5A, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
164
+CHIPSET(0x8A5B, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
165
+CHIPSET(0x8A5C, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
166
+CHIPSET(0x8A5D, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
167
+CHIPSET(0x8A71, icl_1x8, "Intel(R) HD Graphics (Ice Lake 1x8 GT0.5)")
168
+CHIPSET(0x4500, ehl_4x8, "Intel(R) HD Graphics (Elkhart Lake 4x8)")
169
+CHIPSET(0x4571, ehl_4x8, "Intel(R) HD Graphics (Elkhart Lake 4x8)")
170
+CHIPSET(0x4551, ehl_4x4, "Intel(R) HD Graphics (Elkhart Lake 4x4)")
171
+CHIPSET(0x4541, ehl_2x4, "Intel(R) HD Graphics (Elkhart Lake 2x4)")

Return to bug 233221