nvidia: update to 367.27.

closes #4365
This commit is contained in:
Duncaen 2016-07-13 20:59:02 +02:00
parent 67170f5d7a
commit c00c8f4843
3 changed files with 5 additions and 59 deletions

View file

@ -137,6 +137,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
libnvidia-fatbinaryloader.so.367.27 nvidia-libs-367.27_1 ignore
libglapi.so.0 libglapi-7.11_1
libgbm.so.1 libgbm-9.0_1
librsvg-2.so.2 librsvg-2.26.0_1

View file

@ -1,50 +0,0 @@
--- kernel/nvidia-drm/nvidia-drm-fb.c
+++ 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);
--- kernel/nvidia-drm/nvidia-drm-fb.h
+++ 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(
--- kernel/nvidia-drm/nvidia-drm-linux.c
+++ 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);

View file

@ -3,8 +3,8 @@
_desc="NVIDIA drivers for linux (long-lived series)"
pkgname=nvidia
version=364.19
revision=2
version=367.27
revision=1
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Proprietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -24,11 +24,11 @@ build_options_default="glvnd"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
checksum=9f891d4b22c43c9094b59af5c8474e29c70813110b346834a5cad81a224d4112
checksum=faa7c0f73c04a6d343a3952d264ec56fdf816cc6bf2a1c1bb95726401e99654b
else
_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
checksum=d7fcc78409d9ebc5663d1d925076199de2c64bbc16df84d9ed783f8f873e8c5d
checksum=fcab963d0fbd28beb816646f8c2e45fcc9a77896e3ee96a42ea0535221621239
fi
subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs"
@ -39,11 +39,6 @@ do_extract() {
./${_pkg}.run --extract-only
rm -f ${_pkg}.run
}
do_configure() {
cd ${_pkg}
# patches
patch -sNp0 -i ${FILESDIR}/linux-4.6.patch
}
do_install() {
cd ${_pkg}