Merge pull request #180523 from talyz/intel-mesa-22
xf86videointel: Use the `crocus` and `iris` DRI drivers
This commit is contained in:
commit
194e9a120a
@ -972,6 +972,7 @@ self: super:
|
|||||||
buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXv xorg.pixman xorg.utilmacros ];
|
buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXv xorg.pixman xorg.utilmacros ];
|
||||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ];
|
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ];
|
||||||
configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
|
configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
|
||||||
|
patches = [ ./use_crocus_and_iris.patch ];
|
||||||
|
|
||||||
meta = attrs.meta // {
|
meta = attrs.meta // {
|
||||||
platforms = ["i686-linux" "x86_64-linux"];
|
platforms = ["i686-linux" "x86_64-linux"];
|
||||||
|
28
pkgs/servers/x11/xorg/use_crocus_and_iris.patch
Normal file
28
pkgs/servers/x11/xorg/use_crocus_and_iris.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
--- 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;
|
Loading…
Reference in New Issue
Block a user