public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvidia_x11_legacy340: update 340.76 -> 340.94

Browse Source 
Fixes #13658.
This commit is contained in:
Vladimír Čunát 2016-03-03 22:38:53 +01:00
parent beefe9c1a9
commit 54d342add8
2 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/nvidia-x11/legacy340.nix
View File

@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
let let
versionNumber = "340.76"; versionNumber = "340.96";
/* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them.
Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs,
will be included in 340.* legacy releases through the end of 2019. will be included in 340.* legacy releases through the end of 2019.
@ -25,18 +25,16 @@ stdenv.mkDerivation {
builder = ./builder-legacy340.sh; builder = ./builder-legacy340.sh;
patches = [ ./nvidia-340.76-kernel-4.0.patch ];
src = src =
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "1l1nn340hc8iwlzb16gcm2xvnvkw7rf84ll89bcax70094xxjacv"; sha256 = "13j739gg1igll88xpfsx46m7pan4fwpzx5hqdskkdc0srmw2f3n4";
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "016hnsgrcm4ly0mnkcd6c1qkciy3qmbwdwy4rlwq3m6dh4ixw7jc"; sha256 = "1i0lri76ghhr4c6fdlv5gwzd99n70hv3kw21w51anb55msr9s3r8";
} }
else throw "nvidia-x11 does not support platform ${stdenv.system}"; else throw "nvidia-x11 does not support platform ${stdenv.system}";
@ -62,5 +60,6 @@ stdenv.mkDerivation {
license = licenses.unfreeRedistributable; license = licenses.unfreeRedistributable;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.vcunat ]; maintainers = [ maintainers.vcunat ];
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
}; };
} }

28
pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
View File

@ -1,28 +0,0 @@
--- a/kernel/nv-pat.c 2015-07-03 08:39:35.417031728 +0200
+++ b/kernel/nv-pat.c 2015-07-03 08:42:15.631838988 +0200
@@ -35,8 +35,13 @@
unsigned long cr0 = read_cr0();
write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
wbinvd();
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
*cr4 = read_cr4();
if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
+#else
+ *cr4 = __read_cr4();
+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
+#endif
__flush_tlb();
}
@@ -46,7 +51,11 @@
wbinvd();
__flush_tlb();
write_cr0((cr0 & 0x9fffffff));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
if (cr4 & 0x80) write_cr4(cr4);
+#else
+ if (cr4 & 0x80) __write_cr4(cr4);
+#endif
}
static int nv_determine_pat_mode(void)