Skip to content

Commit 6a04bb5

Browse files
committed
drm/xe: remove unused xe_pciids.h harder, add missing PCI ID
Commit 4934544 ("drm/xe: switch to common PCI ID macros") removed xe_pciids.h via drm-intel-next. In the mean time, commit ae78ec0 ("drm/xe/ptl: Add another PTL PCI ID") added to xe_pciids.h via drm-xe-next. The two commits were merged in commit 8f109f2 ("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 <[email protected]> Cc: Matt Roper <[email protected]> Cc: Rodrigo Vivi <[email protected]> Fixes: 8f109f2 ("Merge drm/drm-next into drm-xe-next") Reported-by: Stephen Rothwell <[email protected]> Closes: https://lore.kernel.org/r/[email protected] Reviewed-by: Tejas Upadhyay <[email protected]> Reviewed-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Jani Nikula <[email protected]>
1 parent ee5a132 commit 6a04bb5

File tree

2 files changed

+2
-236
lines changed

2 files changed

+2
-236
lines changed

include/drm/intel/pciids.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,7 @@
829829
MACRO__(0xB092, ## __VA_ARGS__), \
830830
MACRO__(0xB0A0, ## __VA_ARGS__), \
831831
MACRO__(0xB0A1, ## __VA_ARGS__), \
832-
MACRO__(0xB0A2, ## __VA_ARGS__)
832+
MACRO__(0xB0A2, ## __VA_ARGS__), \
833+
MACRO__(0xB0B0, ## __VA_ARGS__)
833834

834835
#endif /* __PCIIDS_H__ */

include/drm/intel/xe_pciids.h

-235
This file was deleted.

0 commit comments

Comments
 (0)