Mesa (main): loader: Restore i915g support.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: af163d72200f4eb94f411c16dd105315f82e89d5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=af163d72200f4eb94f411c16dd105315f82e89d5

Author: Emma Anholt <emma at anholt.net>
Date:   Wed Dec  8 16:36:59 2021 -0800

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 at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14131>

---

 src/loader/pci_id_driver_map.h | 7 +++++++
 1 file changed, 7 insertions(+)

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) },