loader: Check if the kernel driver is i915 before loading iris

[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 9b4618e160148a75f21cadb765c1347f9ea88c4b..1dc07be390c014a728523ebea47724f172c90058 100644 (file)
--- a/src/loader/pci_id_driver_map.h
+++ b/src/loader/pci_id_driver_map.h
@@ -57,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;
@@ -67,7 +68,7 @@ static const struct {
 } driver_map[] = {
    { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
    { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
-   { 0x8086, "iris", NULL, -1 },
+   { 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) },