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

[Felix Yan]

    Date: Wednesday, May 18, 2016 @ 16:09:55
  Author: fyan
Revision: 268291

upgpkg: nvidia 364.19-4

patch & rebuild for linux 4.6

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

-----------------+
 PKGBUILD        |    3 +++
 linux-4.6.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-18 14:09:22 UTC (rev 268290)
+++ PKGBUILD	2016-05-18 14:09:55 UTC (rev 268291)
@@ -14,8 +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')
 
@@ -26,6 +28,7 @@
     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

Added: linux-4.6.patch
===================================================================
--- linux-4.6.patch	                        (rev 0)
+++ linux-4.6.patch	2016-05-18 14:09:55 UTC (rev 268291)
@@ -0,0 +1,50 @@
+--- 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