Some cleanups first, then a swich to drm/xe style PCI ID macros where you pass the macro to use. This is not just for the sake of cleanups, they'll be useful in follow-up work for display devices. BR, Jani. Jani Nikula (5): drm/i915: don't include CML PCI IDs in CFL drm/i915: don't include RPL-U PCI IDs in RPL-P drm/i915: separate RPL-U from RPL-P drm/i915: simplify ULT/ULX subplatform detection drm/i915: make the PCI ID macros more flexible arch/x86/kernel/early-quirks.c | 84 +- .../drm/i915/display/intel_display_device.c | 91 +- drivers/gpu/drm/i915/i915_drv.h | 9 +- drivers/gpu/drm/i915/i915_pci.c | 149 +- drivers/gpu/drm/i915/intel_device_info.c | 99 +- drivers/gpu/drm/i915/intel_step.c | 2 +- include/drm/i915_pciids.h | 1307 +++++++++-------- 7 files changed, 872 insertions(+), 869 deletions(-) -- 2.39.2