nixpkgs/pkgs/servers/x11/xorg/use_crocus_and_iris.patch
talyz 037167ae17
xf86videointel: Use the crocus and iris DRI drivers
The i965 driver was removed in Mesa 22, but the xf86videointel driver
hasn't been updated to reflect this. This leads to the following error
when used with the affected hardware:

(EE) AIGLX error: dlopen of /run/opengl-driver/lib/dri/i965_dri.so failed
                  (/run/opengl-driver/lib/dri/i965_dri.so: cannot open
                  shared object file: No such file or directory)
(EE) AIGLX error: unable to load driver i965

To fix this, add a patch which makes the driver return the appropriate
DRI driver name from Mesa 22, i.e. `crocus` for older GPUs and `iris`
for newer.
2022-07-07 14:52:29 +02:00

28 lines
598 B
Diff

--- a/src/uxa/intel_dri.c
+++ b/src/uxa/intel_dri.c
@@ -1540,8 +1540,10 @@
return has_i830_dri() ? "i830" : "i915";
else if (INTEL_INFO(intel)->gen < 040)
return "i915";
+ else if (INTEL_INFO(intel)->gen < 0100)
+ return "crocus";
else
- return "i965";
+ return "iris";
}
return s;
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -3707,8 +3707,10 @@
return has_i830_dri() ? "i830" : "i915";
else if (sna->kgem.gen < 040)
return "i915";
+ else if (sna->kgem.gen < 0100)
+ return "crocus";
else
- return "i965";
+ return "iris";
}
return s;