nvidia-304xx & nvidia-utils-304xx: rebuild for kernel 4.4.26

3 files changed, 11 insertions, 158 deletions

diff --git a/abs/core/nvidia-304xx-utils/PKGBUILD b/abs/core/nvidia-304xx-utils/PKGBUILD
index 9cd105c..45a30f0 100644
--- a/abs/core/nvidia-304xx-utils/PKGBUILD
+++ b/abs/core/nvidia-304xx-utils/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
-pkgver=304.131
+pkgver=304.132
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -13,8 +13,8 @@ makedepends=('zlib')
 options=('!strip')
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha512sums_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
-sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
+sha512sums_i686=('70a6ed74a93ac2a1acec5eab5078dfe05fab66c6264d67f3238a6b28af7b39f7205e237214bac4ee5d2366e8c6a4a63dfc8dc113e9e977ee2387c5c8c63ccc8f')
+sha512sums_x86_64=('990c79120536335f83ecd665140b2af8f778785a2cdc8afb06abbacba49e66d87f5af25fb4d6c64779cf898b61273d17cb0213516f497d1c0fbd63b7c5e85d8c')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'
@@ -60,8 +60,8 @@ package_opencl-nvidia-304xx() {
 package_nvidia-304xx-libgl() {
   pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch"
   depends=('nvidia-304xx-utils' 'mesa')
-  conflicts=('libgl' 'nvidia-libgl')
-  provides=('libgl' 'nvidia-libgl')
+  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
+  provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
 
   cd ${_pkg}
 
diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD
index fd5952f..e2a8a6d 100644
--- a/abs/core/nvidia-304xx/PKGBUILD
+++ b/abs/core/nvidia-304xx/PKGBUILD
@@ -4,22 +4,21 @@
 
 pkgbase=nvidia-304xx
 pkgname=(nvidia-304xx nvidia-304xx-dkms)
-pkgver=304.131
+pkgver=304.132
 _extramodules=extramodules-4.4-ARCH
-pkgrel=16
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5')
 conflicts=('nvidia')
 license=('custom')
 options=('!strip')
-source=('disable-mtrr.patch' 'linux-4.6.patch')
+source=('disable-mtrr.patch')
 source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774'
-            'a240e354fcc8ad69982206b4291dfe0fa3660b410d0ffa7903c4fcdb2397254293bfa3160874f89327cfca85d78385260072008091990bc6640ea047e55c53ab')
-sha512sums_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
-sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
+sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+sha512sums_i686=('70a6ed74a93ac2a1acec5eab5078dfe05fab66c6264d67f3238a6b28af7b39f7205e237214bac4ee5d2366e8c6a4a63dfc8dc113e9e977ee2387c5c8c63ccc8f')
+sha512sums_x86_64=('990c79120536335f83ecd665140b2af8f778785a2cdc8afb06abbacba49e66d87f5af25fb4d6c64779cf898b61273d17cb0213516f497d1c0fbd63b7c5e85d8c')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -33,8 +32,6 @@ prepare() {
     # FS#47092
     (cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch)
 
-#    patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
-
     cp -a kernel kernel-dkms
 }
 
diff --git a/abs/core/nvidia-304xx/linux-4.6.patch b/abs/core/nvidia-304xx/linux-4.6.patch
deleted file mode 100644
index 5a55989..0000000
--- a/abs/core/nvidia-304xx/linux-4.6.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- /dev/null
-+++ b/kernel/nv-mm.h
-@@ -0,0 +1,55 @@
-+/*******************************************************************************
-+    Copyright (c) 2016 NVIDIA Corporation
-+
-+    Permission is hereby granted, free of charge, to any person obtaining a copy
-+    of this software and associated documentation files (the "Software"), to
-+    deal in the Software without restriction, including without limitation the
-+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+    sell copies of the Software, and to permit persons to whom the Software is
-+    furnished to do so, subject to the following conditions:
-+
-+        The above copyright notice and this permission notice shall be
-+        included in all copies or substantial portions of the Software.
-+
-+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+    DEALINGS IN THE SOFTWARE.
-+
-+*******************************************************************************/
-+#ifndef __NV_MM_H__
-+#define __NV_MM_H__
-+
-+/*  get_user_pages_remote() was added by:
-+ *    2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
-+ *
-+ *  The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
-+ *  deprecated the 8-argument version of get_user_pages for the
-+ *  non-remote case (calling get_user_pages with current and current->mm).
-+ *
-+ *  The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
-+ *  version that uses something other than current and current->mm. Use
-+ *  NV_GET_USER_PAGES if you are refering to current and current->mm.
-+ *
-+*  Note that get_user_pages_remote() requires the caller to hold a reference on
-+*  the task_struct (if non-NULL) and the mm_struct. This will always be true
-+*  when using current and current->mm. If the kernel passes the driver a vma
-+*  via driver callback, the kernel holds a reference on vma->vm_mm over that
-+*  callback.
-+ */
-+
-+#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
-+    #define NV_GET_USER_PAGES           get_user_pages
-+    #define NV_GET_USER_PAGES_REMOTE    get_user_pages_remote
-+#else
-+    #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
-+        get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
-+
-+    #define NV_GET_USER_PAGES_REMOTE    get_user_pages
-+#endif
-+
-+
-+#endif // __NV_MM_H__
---- a/kernel/nv-mlock.c
-+++ b/kernel/nv-mlock.c
-@@ -13,6 +13,7 @@
- 
- #include "os-interface.h"
- #include "nv-linux.h"
-+#include "nv-mm.h"
- 
- RM_STATUS NV_API_CALL nv_lock_user_pages(
-     nv_state_t *nv,
-@@ -49,7 +50,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
-     }
- 
-     down_read(&mm->mmap_sem);
--    ret = get_user_pages(current, mm, (unsigned long)address,
-+    ret = NV_GET_USER_PAGES((unsigned long)address,
-             page_count, write, force, user_pages, NULL);
-     up_read(&mm->mmap_sem);
-     pinned = ret;
-@@ -62,7 +62,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
-     else if (pinned < page_count)
-     {
-         for (i = 0; i < pinned; i++)
--            page_cache_release(user_pages[i]);
-+            put_page(user_pages[i]);
-         os_free_mem(user_pages);
-         return RM_ERR_INVALID_ADDRESS;
-     }
-@@ -81,7 +81,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
-             {
-                 pci_unmap_page(dev, pte_array[j],
-                         PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
--                page_cache_release(user_pages[j]);
-+                put_page(user_pages[j]);
-             }
-             os_free_mem(user_pages);
-             return RM_ERR_OPERATING_SYSTEM;
-@@ -114,7 +114,7 @@ RM_STATUS NV_API_CALL os_unlock_user_pages(
-                 PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
-         if (write)
-             set_page_dirty_lock(user_pages[i]);
--        page_cache_release(user_pages[i]);
-+        put_page(user_pages[i]);
-     }
- 
-     os_free_mem(user_pages);
-diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
-index d01488b..308ea8a 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1525,6 +1525,23 @@ compile_test() {
- 
-             compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions"
-         ;;
-+
-+        get_user_pages_remote)
-+            #
-+            # Determine if the function get_user_pages_remote() is
-+            # present.
-+            #
-+            # get_user_pages_remote() was added by:
-+            #   2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
-+            #
-+            CODE="
-+            #include <linux/mm.h>
-+            int conftest_get_user_pages_remote(void) {
-+                get_user_pages_remote();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
-+        ;;
-     esac
- }
- 
---- a/kernel/Makefile.kbuild
-+++ b/kernel/Makefile.kbuild
-@@ -187,7 +187,8 @@ COMPILE_TESTS = \
- 	drm_pci_set_busid \
- 	write_cr4 \
- 	for_each_online_node \
--	node_end_pfn
-+	node_end_pfn \
-+	get_user_pages_remote
- 
- #
- # CFLAGS dependent on the type of builds (e.g. single/muliple module, debug)