egl/drm: reinstate (kms_)swrast support

[mesa.git] / src / loader / pci_id_driver_map.h

diff --git a/src/loader/pci_id_driver_map.h b/src/loader/pci_id_driver_map.h
index a05fb2c273e2b2f40897074d92f86bffc050fd64..1dc07be390c014a728523ebea47724f172c90058 100644 (file)
--- a/src/loader/pci_id_driver_map.h
+++ b/src/loader/pci_id_driver_map.h
@@ -15,26 +15,8 @@ static const int i915_chip_ids[] = {
 };
 
 static const int i965_chip_ids[] = {
-#define CHIPSET(chip, family, name) chip,
-#define IRIS 0 /* all i965 devices */
+#define CHIPSET(chip, family, family_str, name) chip,
 #include "pci_ids/i965_pci_ids.h"
-#undef IRIS
-#undef CHIPSET
-};
-
-static const int iris_chip_ids_1[] = {
-#define CHIPSET(chip, family, name) chip,
-#define IRIS 1 /* iris devices to try before i965 */
-#include "pci_ids/i965_pci_ids.h"
-#undef IRIS
-#undef CHIPSET
-};
-
-static const int iris_chip_ids_2[] = {
-#define CHIPSET(chip, family, name) chip,
-#define IRIS 2 /* iris devices to try after i965 */
-#include "pci_ids/i965_pci_ids.h"
-#undef IRIS
 #undef CHIPSET
 };
 
@@ -75,6 +57,7 @@ static const int vmwgfx_chip_ids[] = {
 };
 
 bool is_nouveau_vieux(int fd);
+bool is_kernel_i915(int fd);
 
 static const struct {
    int vendor_id;
@@ -84,9 +67,8 @@ static const struct {
    bool (*predicate)(int fd);
 } driver_map[] = {
    { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
-   { 0x8086, "iris", iris_chip_ids_1, ARRAY_SIZE(iris_chip_ids_1) },
    { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
-   { 0x8086, "iris", iris_chip_ids_2, ARRAY_SIZE(iris_chip_ids_2) },
+   { 0x8086, "iris", NULL, -1, is_kernel_i915 },
    { 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) },
    { 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) },
    { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },