diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 90031fbcda..1bbf3d6902 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -20,7 +20,7 @@ PKG_NAME="xf86-video-nvidia" # Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version. # Host may require installation of python-lxml and python-requests packages. -PKG_VERSION="367.35" +PKG_VERSION="367.44" PKG_REV="1" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" diff --git a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-01-kernel-4.7.patch b/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-01-kernel-4.7.patch deleted file mode 100644 index 107e24f79f..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-01-kernel-4.7.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur a/kernel/nvidia-uvm/uvm_linux.h a/kernel/nvidia-uvm/uvm_linux.h ---- a/kernel/nvidia-uvm/uvm_linux.h 2016-06-23 15:43:00.191459104 +0100 -+++ b/kernel/nvidia-uvm/uvm_linux.h 2016-06-23 15:43:43.655703055 +0100 -@@ -563,7 +563,7 @@ - INIT_RADIX_TREE(tree, GFP_NOWAIT); - } - --static bool radix_tree_empty(struct radix_tree_root *tree) -+static bool nv_radix_tree_empty(struct radix_tree_root *tree) - { - void *dummy; - return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0; -diff -Naur a/kernel/nvidia-uvm/uvm8_gpu.c b/kernel/nvidia-uvm/uvm8_gpu.c ---- a/kernel/nvidia-uvm/uvm8_gpu.c 2016-06-23 15:42:53.087419218 +0100 -+++ b/kernel/nvidia-uvm/uvm8_gpu.c 2016-06-23 15:43:26.235605292 +0100 -@@ -638,7 +638,7 @@ - gpu->id, uvm_gpu_retained_count(gpu)); - - // All channels should have been removed before the retained count went to 0 -- UVM_ASSERT(radix_tree_empty(&gpu->instance_ptr_table)); -+ UVM_ASSERT(nv_radix_tree_empty(&gpu->instance_ptr_table)); - - // Remove the GPU from the table. - uvm_spin_lock_irqsave(&g_uvm_global.gpu_table_lock); -diff -Naur a/kernel/nvidia-drm/nvidia-drm-fb.c b/kernel/nvidia-drm/nvidia-drm-fb.c ---- a/kernel/nvidia-drm/nvidia-drm-fb.c 2016-06-23 16:06:44.913671941 +0100 -+++ b/kernel/nvidia-drm/nvidia-drm-fb.c 2016-06-23 16:07:10.469839787 +0100 -@@ -114,7 +114,7 @@ - * We don't support any planar format, pick up first buffer only. - */ - -- gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); - - if (gem == NULL) - { -diff -Naur a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c ---- a/kernel/nvidia-drm/nvidia-drm-gem.c 2016-06-23 16:06:53.689729630 +0100 -+++ b/kernel/nvidia-drm/nvidia-drm-gem.c 2016-06-23 16:07:34.029994134 +0100 -@@ -408,7 +408,7 @@ - - mutex_lock(&dev->struct_mutex); - -- gem = drm_gem_object_lookup(dev, file, handle); -+ gem = drm_gem_object_lookup(file, handle); - - if (gem == NULL) - { diff --git a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules index 2be91e77a8..ccf20f26f1 100644 --- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules +++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules @@ -313,8 +313,17 @@ ATTRS{device}=="0x17c8", GOTO="configure_nvidia" ATTRS{device}=="0x17f0", GOTO="configure_nvidia" ATTRS{device}=="0x17f1", GOTO="configure_nvidia" ATTRS{device}=="0x17fd", GOTO="configure_nvidia" +ATTRS{device}=="0x1b00", GOTO="configure_nvidia" ATTRS{device}=="0x1b80", GOTO="configure_nvidia" ATTRS{device}=="0x1b81", GOTO="configure_nvidia" +ATTRS{device}=="0x1ba0", GOTO="configure_nvidia" +ATTRS{device}=="0x1ba1", GOTO="configure_nvidia" +ATTRS{device}=="0x1be0", GOTO="configure_nvidia" +ATTRS{device}=="0x1be1", GOTO="configure_nvidia" +ATTRS{device}=="0x1c02", GOTO="configure_nvidia" +ATTRS{device}=="0x1c03", GOTO="configure_nvidia" +ATTRS{device}=="0x1c20", GOTO="configure_nvidia" +ATTRS{device}=="0x1c60", GOTO="configure_nvidia" GOTO="configure_nvidia-legacy" LABEL="configure_nvidia"