summaryrefslogtreecommitdiff
path: root/src/loader
diff options
context:
space:
mode:
authorEmma Anholt <emma@anholt.net>2021-12-08 16:36:59 -0800
committerEmma Anholt <emma@anholt.net>2021-12-09 09:05:23 -0800
commitaf163d72200f4eb94f411c16dd105315f82e89d5 (patch)
tree62fb120c313b2433878f750fc7fa3648520d7f88 /src/loader
parentc50bdacbda6dc63d4c794e79357ffebf9756aa8a (diff)
downloadmesa-af163d72200f4eb94f411c16dd105315f82e89d5.tar.gz
loader: Restore i915g support.
The cleanup of i915c cleaned up our PCI ID list. Fixes: 0cad451f007f ("classic/i915: Remove driver") Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14131>
Diffstat (limited to 'src/loader')
-rw-r--r--src/loader/pci_id_driver_map.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/loader/pci_id_driver_map.h b/src/loader/pci_id_driver_map.h
index 5ffcf05e4fd..59dc5b4fbad 100644
--- a/src/loader/pci_id_driver_map.h
+++ b/src/loader/pci_id_driver_map.h
@@ -8,6 +8,12 @@
# error "Only include from loader.c"
#endif
+static const int i915_chip_ids[] = {
+#define CHIPSET(chip, desc, name) chip,
+#include "pci_ids/i915_pci_ids.h"
+#undef CHIPSET
+};
+
static const int crocus_chip_ids[] = {
#define CHIPSET(chip, family, family_str, name) chip,
#include "pci_ids/crocus_pci_ids.h"
@@ -47,6 +53,7 @@ static const struct {
int num_chips_ids;
bool (*predicate)(int fd);
} driver_map[] = {
+ { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
{ 0x8086, "crocus", crocus_chip_ids, ARRAY_SIZE(crocus_chip_ids) },
{ 0x8086, "iris", NULL, -1, is_kernel_i915 },
{ 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },