diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-10-05 22:30:51 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2019-10-28 23:21:39 +0000 |
| commit | cd04b63c0007e5fc7a9a1deb2de58091942cb2fc (patch) | |
| tree | 4e20acc39330ec826e32e0bdde270f6b8593a55f /src/loader | |
| parent | ea8116908ce7ecb610f68d1333352258c2bfc00a (diff) | |
loader: default to iris for all future PCI IDs
The existing "fallback" code didn't actually do anything, so this
removes it, and instead we just always fallback to `iris` for future
PCI IDs.
Suggested-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/loader')
| -rw-r--r-- | src/loader/pci_id_driver_map.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/loader/pci_id_driver_map.h b/src/loader/pci_id_driver_map.h index a05fb2c273e..f5fc349c1cc 100644 --- a/src/loader/pci_id_driver_map.h +++ b/src/loader/pci_id_driver_map.h @@ -16,25 +16,7 @@ static const int i915_chip_ids[] = { static const int i965_chip_ids[] = { #define CHIPSET(chip, family, name) chip, -#define IRIS 0 /* all i965 devices */ #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 }; @@ -84,9 +66,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 }, { 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) }, |