Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/xe: remove unused xe_pciids.h harder, add missing PCI ID
Commit 493454445c95 ("drm/xe: switch to common PCI ID macros") removed
xe_pciids.h via drm-intel-next. In the mean time, commit ae78ec0a52c4
("drm/xe/ptl: Add another PTL PCI ID") added to xe_pciids.h via
drm-xe-next.
The two commits were merged in commit 8f109f287fdc ("Merge drm/drm-next
into drm-xe-next"), but xe_pciids.h wasn't removed, and the PCI ID
wasn't added to pciids.h.
Remove xe_pciids.h, and add the PCI ID to pciids.h.
Cc: Matt Atwood <matthew.s.atwood@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Fixes: 8f109f287fdc ("Merge drm/drm-next into drm-xe-next")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/r/20241125120921.1bbc1930@canb.auug.org.au
Reviewed-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250109105032.2585416-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+2
-236
+2
-1
include/drm/intel/pciids.h
+2
-1
include/drm/intel/pciids.h
-235
include/drm/intel/xe_pciids.h
-235
include/drm/intel/xe_pciids.h
···
1
-
/* SPDX-License-Identifier: MIT */
2
-
/*
3
-
* Copyright © 2022 Intel Corporation
4
-
*/
5
-
6
-
#ifndef _XE_PCIIDS_H_
7
-
#define _XE_PCIIDS_H_
8
-
9
-
/*
10
-
* Lists below can be turned into initializers for a struct pci_device_id
11
-
* by defining INTEL_VGA_DEVICE:
12
-
*
13
-
* #define INTEL_VGA_DEVICE(id, info) { \
14
-
* 0x8086, id, \
15
-
* ~0, ~0, \
16
-
* 0x030000, 0xff0000, \
17
-
* (unsigned long) info }
18
-
*
19
-
* And then calling like:
20
-
*
21
-
* XE_TGL_12_GT1_IDS(INTEL_VGA_DEVICE, ## __VA_ARGS__)
22
-
*
23
-
* To turn them into something else, just provide a different macro passed as
24
-
* first argument.
25
-
*/
26
-
27
-
/* TGL */
28
-
#define XE_TGL_GT1_IDS(MACRO__, ...) \
29
-
MACRO__(0x9A60, ## __VA_ARGS__), \
30
-
MACRO__(0x9A68, ## __VA_ARGS__), \
31
-
MACRO__(0x9A70, ## __VA_ARGS__)
32
-
33
-
#define XE_TGL_GT2_IDS(MACRO__, ...) \
34
-
MACRO__(0x9A40, ## __VA_ARGS__), \
35
-
MACRO__(0x9A49, ## __VA_ARGS__), \
36
-
MACRO__(0x9A59, ## __VA_ARGS__), \
37
-
MACRO__(0x9A78, ## __VA_ARGS__), \
38
-
MACRO__(0x9AC0, ## __VA_ARGS__), \
39
-
MACRO__(0x9AC9, ## __VA_ARGS__), \
40
-
MACRO__(0x9AD9, ## __VA_ARGS__), \
41
-
MACRO__(0x9AF8, ## __VA_ARGS__)
42
-
43
-
#define XE_TGL_IDS(MACRO__, ...) \
44
-
XE_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__),\
45
-
XE_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__)
46
-
47
-
/* RKL */
48
-
#define XE_RKL_IDS(MACRO__, ...) \
49
-
MACRO__(0x4C80, ## __VA_ARGS__), \
50
-
MACRO__(0x4C8A, ## __VA_ARGS__), \
51
-
MACRO__(0x4C8B, ## __VA_ARGS__), \
52
-
MACRO__(0x4C8C, ## __VA_ARGS__), \
53
-
MACRO__(0x4C90, ## __VA_ARGS__), \
54
-
MACRO__(0x4C9A, ## __VA_ARGS__)
55
-
56
-
/* DG1 */
57
-
#define XE_DG1_IDS(MACRO__, ...) \
58
-
MACRO__(0x4905, ## __VA_ARGS__), \
59
-
MACRO__(0x4906, ## __VA_ARGS__), \
60
-
MACRO__(0x4907, ## __VA_ARGS__), \
61
-
MACRO__(0x4908, ## __VA_ARGS__), \
62
-
MACRO__(0x4909, ## __VA_ARGS__)
63
-
64
-
/* ADL-S */
65
-
#define XE_ADLS_IDS(MACRO__, ...) \
66
-
MACRO__(0x4680, ## __VA_ARGS__), \
67
-
MACRO__(0x4682, ## __VA_ARGS__), \
68
-
MACRO__(0x4688, ## __VA_ARGS__), \
69
-
MACRO__(0x468A, ## __VA_ARGS__), \
70
-
MACRO__(0x468B, ## __VA_ARGS__), \
71
-
MACRO__(0x4690, ## __VA_ARGS__), \
72
-
MACRO__(0x4692, ## __VA_ARGS__), \
73
-
MACRO__(0x4693, ## __VA_ARGS__)
74
-
75
-
/* ADL-P */
76
-
#define XE_ADLP_IDS(MACRO__, ...) \
77
-
MACRO__(0x46A0, ## __VA_ARGS__), \
78
-
MACRO__(0x46A1, ## __VA_ARGS__), \
79
-
MACRO__(0x46A2, ## __VA_ARGS__), \
80
-
MACRO__(0x46A3, ## __VA_ARGS__), \
81
-
MACRO__(0x46A6, ## __VA_ARGS__), \
82
-
MACRO__(0x46A8, ## __VA_ARGS__), \
83
-
MACRO__(0x46AA, ## __VA_ARGS__), \
84
-
MACRO__(0x462A, ## __VA_ARGS__), \
85
-
MACRO__(0x4626, ## __VA_ARGS__), \
86
-
MACRO__(0x4628, ## __VA_ARGS__), \
87
-
MACRO__(0x46B0, ## __VA_ARGS__), \
88
-
MACRO__(0x46B1, ## __VA_ARGS__), \
89
-
MACRO__(0x46B2, ## __VA_ARGS__), \
90
-
MACRO__(0x46B3, ## __VA_ARGS__), \
91
-
MACRO__(0x46C0, ## __VA_ARGS__), \
92
-
MACRO__(0x46C1, ## __VA_ARGS__), \
93
-
MACRO__(0x46C2, ## __VA_ARGS__), \
94
-
MACRO__(0x46C3, ## __VA_ARGS__)
95
-
96
-
/* ADL-N */
97
-
#define XE_ADLN_IDS(MACRO__, ...) \
98
-
MACRO__(0x46D0, ## __VA_ARGS__), \
99
-
MACRO__(0x46D1, ## __VA_ARGS__), \
100
-
MACRO__(0x46D2, ## __VA_ARGS__), \
101
-
MACRO__(0x46D3, ## __VA_ARGS__), \
102
-
MACRO__(0x46D4, ## __VA_ARGS__)
103
-
104
-
/* RPL-S */
105
-
#define XE_RPLS_IDS(MACRO__, ...) \
106
-
MACRO__(0xA780, ## __VA_ARGS__), \
107
-
MACRO__(0xA781, ## __VA_ARGS__), \
108
-
MACRO__(0xA782, ## __VA_ARGS__), \
109
-
MACRO__(0xA783, ## __VA_ARGS__), \
110
-
MACRO__(0xA788, ## __VA_ARGS__), \
111
-
MACRO__(0xA789, ## __VA_ARGS__), \
112
-
MACRO__(0xA78A, ## __VA_ARGS__), \
113
-
MACRO__(0xA78B, ## __VA_ARGS__)
114
-
115
-
/* RPL-U */
116
-
#define XE_RPLU_IDS(MACRO__, ...) \
117
-
MACRO__(0xA721, ## __VA_ARGS__), \
118
-
MACRO__(0xA7A1, ## __VA_ARGS__), \
119
-
MACRO__(0xA7A9, ## __VA_ARGS__), \
120
-
MACRO__(0xA7AC, ## __VA_ARGS__), \
121
-
MACRO__(0xA7AD, ## __VA_ARGS__)
122
-
123
-
/* RPL-P */
124
-
#define XE_RPLP_IDS(MACRO__, ...) \
125
-
MACRO__(0xA720, ## __VA_ARGS__), \
126
-
MACRO__(0xA7A0, ## __VA_ARGS__), \
127
-
MACRO__(0xA7A8, ## __VA_ARGS__), \
128
-
MACRO__(0xA7AA, ## __VA_ARGS__), \
129
-
MACRO__(0xA7AB, ## __VA_ARGS__)
130
-
131
-
/* DG2 */
132
-
#define XE_DG2_G10_IDS(MACRO__, ...) \
133
-
MACRO__(0x5690, ## __VA_ARGS__), \
134
-
MACRO__(0x5691, ## __VA_ARGS__), \
135
-
MACRO__(0x5692, ## __VA_ARGS__), \
136
-
MACRO__(0x56A0, ## __VA_ARGS__), \
137
-
MACRO__(0x56A1, ## __VA_ARGS__), \
138
-
MACRO__(0x56A2, ## __VA_ARGS__), \
139
-
MACRO__(0x56BE, ## __VA_ARGS__), \
140
-
MACRO__(0x56BF, ## __VA_ARGS__)
141
-
142
-
#define XE_DG2_G11_IDS(MACRO__, ...) \
143
-
MACRO__(0x5693, ## __VA_ARGS__), \
144
-
MACRO__(0x5694, ## __VA_ARGS__), \
145
-
MACRO__(0x5695, ## __VA_ARGS__), \
146
-
MACRO__(0x56A5, ## __VA_ARGS__), \
147
-
MACRO__(0x56A6, ## __VA_ARGS__), \
148
-
MACRO__(0x56B0, ## __VA_ARGS__), \
149
-
MACRO__(0x56B1, ## __VA_ARGS__), \
150
-
MACRO__(0x56BA, ## __VA_ARGS__), \
151
-
MACRO__(0x56BB, ## __VA_ARGS__), \
152
-
MACRO__(0x56BC, ## __VA_ARGS__), \
153
-
MACRO__(0x56BD, ## __VA_ARGS__)
154
-
155
-
#define XE_DG2_G12_IDS(MACRO__, ...) \
156
-
MACRO__(0x5696, ## __VA_ARGS__), \
157
-
MACRO__(0x5697, ## __VA_ARGS__), \
158
-
MACRO__(0x56A3, ## __VA_ARGS__), \
159
-
MACRO__(0x56A4, ## __VA_ARGS__), \
160
-
MACRO__(0x56B2, ## __VA_ARGS__), \
161
-
MACRO__(0x56B3, ## __VA_ARGS__)
162
-
163
-
#define XE_DG2_IDS(MACRO__, ...) \
164
-
XE_DG2_G10_IDS(MACRO__, ## __VA_ARGS__),\
165
-
XE_DG2_G11_IDS(MACRO__, ## __VA_ARGS__),\
166
-
XE_DG2_G12_IDS(MACRO__, ## __VA_ARGS__)
167
-
168
-
#define XE_ATS_M150_IDS(MACRO__, ...) \
169
-
MACRO__(0x56C0, ## __VA_ARGS__), \
170
-
MACRO__(0x56C2, ## __VA_ARGS__)
171
-
172
-
#define XE_ATS_M75_IDS(MACRO__, ...) \
173
-
MACRO__(0x56C1, ## __VA_ARGS__)
174
-
175
-
#define XE_ATS_M_IDS(MACRO__, ...) \
176
-
XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\
177
-
XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)
178
-
179
-
/* ARL */
180
-
#define XE_ARL_IDS(MACRO__, ...) \
181
-
MACRO__(0x7D41, ## __VA_ARGS__), \
182
-
MACRO__(0x7D51, ## __VA_ARGS__), \
183
-
MACRO__(0x7D67, ## __VA_ARGS__), \
184
-
MACRO__(0x7DD1, ## __VA_ARGS__), \
185
-
MACRO__(0xB640, ## __VA_ARGS__)
186
-
187
-
/* MTL */
188
-
#define XE_MTL_IDS(MACRO__, ...) \
189
-
MACRO__(0x7D40, ## __VA_ARGS__), \
190
-
MACRO__(0x7D45, ## __VA_ARGS__), \
191
-
MACRO__(0x7D55, ## __VA_ARGS__), \
192
-
MACRO__(0x7D60, ## __VA_ARGS__), \
193
-
MACRO__(0x7DD5, ## __VA_ARGS__)
194
-
195
-
/* PVC */
196
-
#define XE_PVC_IDS(MACRO__, ...) \
197
-
MACRO__(0x0B69, ## __VA_ARGS__), \
198
-
MACRO__(0x0B6E, ## __VA_ARGS__), \
199
-
MACRO__(0x0BD4, ## __VA_ARGS__), \
200
-
MACRO__(0x0BD5, ## __VA_ARGS__), \
201
-
MACRO__(0x0BD6, ## __VA_ARGS__), \
202
-
MACRO__(0x0BD7, ## __VA_ARGS__), \
203
-
MACRO__(0x0BD8, ## __VA_ARGS__), \
204
-
MACRO__(0x0BD9, ## __VA_ARGS__), \
205
-
MACRO__(0x0BDA, ## __VA_ARGS__), \
206
-
MACRO__(0x0BDB, ## __VA_ARGS__), \
207
-
MACRO__(0x0BE0, ## __VA_ARGS__), \
208
-
MACRO__(0x0BE1, ## __VA_ARGS__), \
209
-
MACRO__(0x0BE5, ## __VA_ARGS__)
210
-
211
-
#define XE_LNL_IDS(MACRO__, ...) \
212
-
MACRO__(0x6420, ## __VA_ARGS__), \
213
-
MACRO__(0x64A0, ## __VA_ARGS__), \
214
-
MACRO__(0x64B0, ## __VA_ARGS__)
215
-
216
-
#define XE_BMG_IDS(MACRO__, ...) \
217
-
MACRO__(0xE202, ## __VA_ARGS__), \
218
-
MACRO__(0xE20B, ## __VA_ARGS__), \
219
-
MACRO__(0xE20C, ## __VA_ARGS__), \
220
-
MACRO__(0xE20D, ## __VA_ARGS__), \
221
-
MACRO__(0xE212, ## __VA_ARGS__)
222
-
223
-
#define XE_PTL_IDS(MACRO__, ...) \
224
-
MACRO__(0xB080, ## __VA_ARGS__), \
225
-
MACRO__(0xB081, ## __VA_ARGS__), \
226
-
MACRO__(0xB082, ## __VA_ARGS__), \
227
-
MACRO__(0xB090, ## __VA_ARGS__), \
228
-
MACRO__(0xB091, ## __VA_ARGS__), \
229
-
MACRO__(0xB092, ## __VA_ARGS__), \
230
-
MACRO__(0xB0A0, ## __VA_ARGS__), \
231
-
MACRO__(0xB0A1, ## __VA_ARGS__), \
232
-
MACRO__(0xB0A2, ## __VA_ARGS__), \
233
-
MACRO__(0xB0B0, ## __VA_ARGS__)
234
-
235
-
#endif