]> git.ipfire.org Git - thirdparty/linux.git/commit
drm/xe: remove unused xe_pciids.h harder, add missing PCI ID
authorJani Nikula <jani.nikula@intel.com>
Thu, 9 Jan 2025 10:50:32 +0000 (12:50 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 10 Jan 2025 09:02:15 +0000 (11:02 +0200)
commit6a04bb5a2046067681257d5dd69a724856c8fbcb
tree2f4d47de20680db1ff423ba426cf502a94a15f8b
parentee5a1321df90891d59d83b7c9d5b6c5b755d059d
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>
include/drm/intel/pciids.h
include/drm/intel/xe_pciids.h [deleted file]