drm/i915: Sort EHL/JSL PCI IDs

Sort the EHL/JSL PCI IDs numerically. Some order seems better than
randomness.

v2: Deal with the JSL vs. EHL split
v3: Rebase due to 0x4500 removal

Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> #v1
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201030164124.16922-1-ville.syrjala@linux.intel.com

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 28428e0..931e461 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -584,19 +584,19 @@
 
 /* EHL */
 #define INTEL_EHL_IDS(info) \
-       INTEL_VGA_DEVICE(0x4571, info), \
-       INTEL_VGA_DEVICE(0x4551, info), \
        INTEL_VGA_DEVICE(0x4541, info), \
+       INTEL_VGA_DEVICE(0x4551, info), \
+       INTEL_VGA_DEVICE(0x4555, info), \
        INTEL_VGA_DEVICE(0x4557, info), \
-       INTEL_VGA_DEVICE(0x4555, info)
+       INTEL_VGA_DEVICE(0x4571, info)
 
 /* JSL */
 #define INTEL_JSL_IDS(info) \
-       INTEL_VGA_DEVICE(0x4E71, info), \
-       INTEL_VGA_DEVICE(0x4E61, info), \
-       INTEL_VGA_DEVICE(0x4E57, info), \
+       INTEL_VGA_DEVICE(0x4E51, info), \
        INTEL_VGA_DEVICE(0x4E55, info), \
-       INTEL_VGA_DEVICE(0x4E51, info)
+       INTEL_VGA_DEVICE(0x4E57, info), \
+       INTEL_VGA_DEVICE(0x4E61, info), \
+       INTEL_VGA_DEVICE(0x4E71, info)
 
 /* TGL */
 #define INTEL_TGL_12_GT1_IDS(info) \