nvidia-stable: update to 340.93.

This commit is contained in:
Juan RP 2015-09-04 09:14:18 +02:00
parent 9ae719c788
commit 2ed3194867
2 changed files with 4 additions and 33 deletions

View file

@ -1,28 +0,0 @@
--- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800
+++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800
@@ -35,8 +35,13 @@
unsigned long cr0 = read_cr0();
write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
wbinvd();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,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 +46,11 @@
wbinvd();
__flush_tlb();
write_cr0((cr0 & 0x9fffffff));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
+ if (cr4 & 0x80) __write_cr4(cr4);
+#else
if (cr4 & 0x80) write_cr4(cr4);
+#endif
}
static int nv_determine_pat_mode(void)

View file

@ -3,8 +3,8 @@
_desc="NVIDIA drivers for linux (long-lived series)"
pkgname=nvidia-stable
version=340.76
revision=7
version=340.93
revision=1
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -23,11 +23,11 @@ subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"
checksum=9b29d93b49009caed84a8852825c3e7c6ebbbba8ec99b03ee5113108c8b036d0
checksum=4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612
else
_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}-no-compat32.run"
checksum=4c1ede2381cdd48139cdc4f3c657c5c347367160a6b1692bf09454969fb6d004
checksum=8fb230a7579a15c778ab7c2f160830682919729235beb8ea2b84326528c54843
fi
do_extract() {
@ -39,7 +39,6 @@ do_extract() {
do_configure() {
cd ${_pkg}
patch -sNp0 -i ${FILESDIR}/nv-drm.patch
patch -sNp0 -i ${FILESDIR}/linux-4.0.patch
}
do_install() {
cd ${_pkg}