AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: default to iris for all future PCI IDs

Browse Source 
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>
This commit is contained in:
Eric Engestrom
2019-10-05 22:30:51 +01:00
parent ea8116908c
commit cd04b63c00
6 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/loader/pci_id_driver_map.h
+1 -20
View File
@@ -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) },