[arch-commits] Commit in nvidia-340xx/trunk (PKGBUILD nvidia-4.0.patch)

[Tobias Powalowski]

    Date: Monday, April 13, 2015 @ 10:03:39
  Author: tpowa
Revision: 236349

upgpkg: nvidia-340xx 340.76-8

bump to 4.0

Added:
  nvidia-340xx/trunk/nvidia-4.0.patch
Modified:
  nvidia-340xx/trunk/PKGBUILD

------------------+
 PKGBUILD         |    7 +++++--
 nvidia-4.0.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-13 08:02:41 UTC (rev 236348)
+++ PKGBUILD	2015-04-13 08:03:39 UTC (rev 236349)
@@ -16,10 +16,12 @@
 options=(!strip)
 source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
         "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-        nv-drm.patch)
+        nv-drm.patch
+        nvidia-4.0.patch)
 md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
          '440df290e213280d6e20d4d4be6f8b4c'
-         '79671a27131da619a33eb02ed0c2c031')
+         '79671a27131da619a33eb02ed0c2c031'
+         'f42bdf589f52d4e6c38baa5bef15eef8')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -29,6 +31,7 @@
     cd "${_pkg}"
     # patches here
     patch -p0 -i ../nv-drm.patch
+    patch -p0 -i ../nvidia-4.0.patch
 }
 
 build() {

Added: nvidia-4.0.patch
===================================================================
--- nvidia-4.0.patch	                        (rev 0)
+++ nvidia-4.0.patch	2015-04-13 08:03:39 UTC (rev 236349)
@@ -0,0 +1,28 @@
+--- 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)