-#ifndef IRIS
+/*
+ * IRIS not defined: include all devices supported by i965 or iris
+ * IRIS == 0: devices where i965 is supported
+ * IRIS == 1: devices where iris is supported, and will be tried before i965
+ * IRIS == 2: devices where iris is supported, and will be tried after i965
+ */
+#if !defined(IRIS) || IRIS == 0
+/* Only try to load i965. Do not attempt iris. */
CHIPSET(0x29A2, i965, "Intel(R) 965G")
CHIPSET(0x2992, i965, "Intel(R) 965Q")
CHIPSET(0x2982, i965, "Intel(R) 965G")
CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)")
CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)")
#endif
+#if !defined(IRIS) || IRIS == 0 || IRIS == 2
+/* First try to load i965, then try iris */
CHIPSET(0x1602, bdw_gt1, "Intel(R) Broadwell GT1")
CHIPSET(0x1606, bdw_gt1, "Intel(R) Broadwell GT1")
CHIPSET(0x160A, bdw_gt1, "Intel(R) Broadwell GT1")
CHIPSET(0x4571, ehl_4x8, "Intel(R) HD Graphics (Elkhart Lake 4x8)")
CHIPSET(0x4551, ehl_4x4, "Intel(R) HD Graphics (Elkhart Lake 4x4)")
CHIPSET(0x4541, ehl_2x4, "Intel(R) HD Graphics (Elkhart Lake 2x4)")
+#endif
+#if !defined(IRIS) || IRIS == 0 || IRIS == 1
+/* First try to load iris, then try i965 */
+#endif
+#if !defined(IRIS) || IRIS == 1
+/* Only try to load iris. Do not attempt i965. */
+#endif