[arch-commits] Commit in nvidia/trunk (PKGBUILD linux-4.6.patch)

[Sven-Hendrik Haase]

    Date: Monday, June 13, 2016 @ 12:27:54
  Author: svenstaro
Revision: 269432

upgpkg: nvidia 367.18-1

upstream release 367.18

Modified:
  nvidia/trunk/PKGBUILD
Deleted:
  nvidia/trunk/linux-4.6.patch

-----------------+
 PKGBUILD        |   12 ++++--------
 linux-4.6.patch |   50 --------------------------------------------------
 2 files changed, 4 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-13 10:25:41 UTC (rev 269431)
+++ PKGBUILD	2016-06-13 10:27:54 UTC (rev 269432)
@@ -5,9 +5,9 @@
 
 pkgbase=nvidia
 pkgname=(nvidia nvidia-dkms)
-pkgver=364.19
+pkgver=367.18
 _extramodules=extramodules-4.6-ARCH
-pkgrel=5
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -14,12 +14,10 @@
 makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.6' 'linux-headers<4.7')
 license=('custom')
 options=('!strip')
-source=('linux-4.6.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")
-md5sums=('3064bd437b26adac246f301f54f2814c')
-md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b')
-md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc')
+md5sums_i686=('9ae023927692dab99f23a006865fa966')
+md5sums_x86_64=('0e01ed625c26ad4e4b44a7b139a3e363')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -27,8 +25,6 @@
 prepare() { 
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
-    # patches here
-    patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
 
     cp -a kernel kernel-dkms
     cd kernel-dkms

Deleted: linux-4.6.patch
===================================================================
--- linux-4.6.patch	2016-06-13 10:25:41 UTC (rev 269431)
+++ linux-4.6.patch	2016-06-13 10:27:54 UTC (rev 269432)
@@ -1,50 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-fb.c
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.c
-@@ -77,7 +77,7 @@
- static struct drm_framebuffer *internal_framebuffer_create
- (
-     struct drm_device *dev,
--    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
-+    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
-     uint64_t nvkms_params_ptr,
-     uint64_t nvkms_params_size
- )
-@@ -199,7 +199,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
-     struct drm_device *dev,
--    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- )
- {
-     return internal_framebuffer_create(dev, file, cmd, 0, 0);
---- a/kernel/nvidia-drm/nvidia-drm-fb.h
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
-@@ -45,7 +45,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
-     struct drm_device *dev,
--    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- );
- 
- int nvidia_drm_add_nvkms_fb(
---- a/kernel/nvidia-drm/nvidia-drm-linux.c
-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
-@@ -31,6 +31,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
-+#include "nv-mm.h"
- #include "nv-pgprot.h"
- 
- MODULE_PARM_DESC(
-@@ -121,8 +122,7 @@
- 
-     down_read(&mm->mmap_sem);
- 
--    pages_pinned = get_user_pages(current, mm,
--                                  address, pages_count, write, force,
-+    pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
-                                   user_pages, NULL);
-     up_read(&mm->mmap_sem);
\ No newline at end of file