[Intel-gfx] [PATCH i-g-t] lib/i915_pciids.h: Organize cnl/cfl ids.

[Rodrigo Vivi]

No functional change.

When CNL patches got rebased on top of cfl
the ids ended up in the middle of CFL ids. So let's
clean-up this mess a bit.

Also remove a spurious line.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 lib/i915_pciids.h | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index 8a10a45..3e4f961 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -341,11 +341,21 @@
 	INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \
 	INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */
 
-
 #define INTEL_CFL_H_IDS(info) \
 	INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
 	INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
 
+#define INTEL_CFL_U_IDS(info) \
+	INTEL_VGA_DEVICE(0x3EA5, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA8, info) /* ULT GT3 */
+
+#define INTEL_CFL_IDS(info) \
+	INTEL_CFL_S_IDS(info), \
+	INTEL_CFL_H_IDS(info), \
+	INTEL_CFL_U_IDS(info)
+
 #define INTEL_CNL_U_GT2_IDS(info) \
 	INTEL_VGA_DEVICE(0x5A52, info),	\
 	INTEL_VGA_DEVICE(0x5A5A, info), \
@@ -364,15 +374,4 @@
 	INTEL_CNL_U_GT2_IDS(info), \
 	INTEL_CNL_Y_GT2_IDS(info)
 
-#define INTEL_CFL_U_IDS(info) \
-	INTEL_VGA_DEVICE(0x3EA5, info), /* ULT GT3 */ \
-	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
-	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
-	INTEL_VGA_DEVICE(0x3EA8, info) /* ULT GT3 */
-
-#define INTEL_CFL_IDS(info) \
-	INTEL_CFL_S_IDS(info), \
-	INTEL_CFL_H_IDS(info), \
-	INTEL_CFL_U_IDS(info)
-
 #endif /* _I915_PCIIDS_H */
-- 
1.9.1